Commit 60bfe8a7 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: MGMT: Remove unused mgmt_*_discovery_complete 



mgmt_start_discovery_complete() and mgmt_stop_discovery_complete() last
uses were removed in 2022 by
commit ec2904c2 ("Bluetooth: Remove dead code from hci_request.c")

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 276af34d

include/net/bluetooth/hci_core.h

+0 −2
Original line number Diff line number Diff line
@@ -2354,8 +2354,6 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); 
void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,

				    u8 status);

void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);

void mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status);

void mgmt_stop_discovery_complete(struct hci_dev *hdev, u8 status);

void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		       u8 addr_type, u8 *dev_class, s8 rssi, u32 flags,

		       u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len,

net/bluetooth/mgmt.c

+0 −40
Original line number Diff line number Diff line
@@ -5743,29 +5743,6 @@ static int remove_remote_oob_data(struct sock *sk, struct hci_dev *hdev, 
	return err;

}



void mgmt_start_discovery_complete(struct hci_dev *hdev, u8 status)

{

	struct mgmt_pending_cmd *cmd;



	bt_dev_dbg(hdev, "status %u", status);



	hci_dev_lock(hdev);



	cmd = pending_find(MGMT_OP_START_DISCOVERY, hdev);

	if (!cmd)

		cmd = pending_find(MGMT_OP_START_SERVICE_DISCOVERY, hdev);



	if (!cmd)

		cmd = pending_find(MGMT_OP_START_LIMITED_DISCOVERY, hdev);



	if (cmd) {

		cmd->cmd_complete(cmd, mgmt_status(status));

		mgmt_pending_remove(cmd);

	}



	hci_dev_unlock(hdev);

}



static bool discovery_type_is_valid(struct hci_dev *hdev, uint8_t type,

				    uint8_t *mgmt_status)

{
@@ -6018,23 +5995,6 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev, 
	return err;

}



void mgmt_stop_discovery_complete(struct hci_dev *hdev, u8 status)

{

	struct mgmt_pending_cmd *cmd;



	bt_dev_dbg(hdev, "status %u", status);



	hci_dev_lock(hdev);



	cmd = pending_find(MGMT_OP_STOP_DISCOVERY, hdev);

	if (cmd) {

		cmd->cmd_complete(cmd, mgmt_status(status));

		mgmt_pending_remove(cmd);

	}



	hci_dev_unlock(hdev);

}



static void stop_discovery_complete(struct hci_dev *hdev, void *data, int err)

{

	struct mgmt_pending_cmd *cmd = data;