Commit 9e63767d authored by Brian Gix's avatar Brian Gix Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: Delete unused hci_req_stop_discovery() 



hci_req_stop_discovery has been deprecated in favor of
hci_stop_discovery_sync() as part of transition to hci_sync.c

Signed-off-by: default avatarBrian Gix <brian.gix@intel.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 27d54b77

net/bluetooth/hci_request.c

+0 −48
Original line number Diff line number Diff line
@@ -1975,54 +1975,6 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason) 
	return 0;

}



bool hci_req_stop_discovery(struct hci_request *req)

{

	struct hci_dev *hdev = req->hdev;

	struct discovery_state *d = &hdev->discovery;

	struct hci_cp_remote_name_req_cancel cp;

	struct inquiry_entry *e;

	bool ret = false;



	bt_dev_dbg(hdev, "state %u", hdev->discovery.state);



	if (d->state == DISCOVERY_FINDING || d->state == DISCOVERY_STOPPING) {

		if (test_bit(HCI_INQUIRY, &hdev->flags))

			hci_req_add(req, HCI_OP_INQUIRY_CANCEL, 0, NULL);



		if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {

			cancel_delayed_work(&hdev->le_scan_disable);

			cancel_delayed_work(&hdev->le_scan_restart);

			hci_req_add_le_scan_disable(req, false);

		}



		ret = true;

	} else {

		/* Passive scanning */

		if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {

			hci_req_add_le_scan_disable(req, false);

			ret = true;

		}

	}



	/* No further actions needed for LE-only discovery */

	if (d->type == DISCOV_TYPE_LE)

		return ret;



	if (d->state == DISCOVERY_RESOLVING || d->state == DISCOVERY_STOPPING) {

		e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,

						     NAME_PENDING);

		if (!e)

			return ret;



		bacpy(&cp.bdaddr, &e->data.bdaddr);

		hci_req_add(req, HCI_OP_REMOTE_NAME_REQ_CANCEL, sizeof(cp),

			    &cp);

		ret = true;

	}



	return ret;

}



static void config_data_path_complete(struct hci_dev *hdev, u8 status,

				      u16 opcode)

{

net/bluetooth/hci_request.h

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy, 
void __hci_req_update_class(struct hci_request *req);



/* Returns true if HCI commands were queued */

bool hci_req_stop_discovery(struct hci_request *req);



int hci_req_configure_datapath(struct hci_dev *hdev, struct bt_codec *codec);



void __hci_req_update_scan(struct hci_request *req);