Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef5234a authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Remove start discovery handling from hci_event.c 



Since all mgmt start discovery command complete events are now handled
in start_discovery_complete callback in mgmt.c, we can remove this
handling from hci_event.c.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 7c307720

net/bluetooth/hci_event.c

+1 −23
Original line number Diff line number Diff line
@@ -943,12 +943,6 @@ static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%2.2x", hdev->name, status);



	if (status) {

		hci_dev_lock(hdev);

		mgmt_start_discovery_failed(hdev, status);

		hci_dev_unlock(hdev);

		return;

	}

}



static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
@@ -965,18 +959,10 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 


	switch (cp->enable) {

	case LE_SCAN_ENABLE:

		if (status) {

			hci_dev_lock(hdev);

			mgmt_start_discovery_failed(hdev, status);

			hci_dev_unlock(hdev);

		if (status)

			return;

		}



		set_bit(HCI_LE_SCAN, &hdev->dev_flags);



		hci_dev_lock(hdev);

		hci_discovery_set_state(hdev, DISCOVERY_FINDING);

		hci_dev_unlock(hdev);

		break;



	case LE_SCAN_DISABLE:
@@ -1077,18 +1063,10 @@ static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) 


	if (status) {

		hci_conn_check_pending(hdev);

		hci_dev_lock(hdev);

		if (test_bit(HCI_MGMT, &hdev->dev_flags))

			mgmt_start_discovery_failed(hdev, status);

		hci_dev_unlock(hdev);

		return;

	}



	set_bit(HCI_INQUIRY, &hdev->flags);



	hci_dev_lock(hdev);

	hci_discovery_set_state(hdev, DISCOVERY_FINDING);

	hci_dev_unlock(hdev);

}



static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)