aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2013-04-30 14:29:38 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-22 19:23:52 -0400
commitb0434345f2a7330be5277b63606cff26a7965982 (patch)
treedc553eadaf0334a98a80a202a57aec011bdd3915 /net/bluetooth
parent917eedc56c65ba96a3bab4c346d948e73dd872f1 (diff)
Bluetooth: Remove inquiry helpers
This patch removes hci_do_inquiry and hci_cancel_inquiry helpers. We now use the HCI request framework in device discovery functionality and these helpers are no longer needed. Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 100539fcbfe5..e2e9d409d0f6 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3501,36 +3501,6 @@ static void hci_cmd_work(struct work_struct *work)
3501 } 3501 }
3502} 3502}
3503 3503
3504int hci_do_inquiry(struct hci_dev *hdev, u8 length)
3505{
3506 /* General inquiry access code (GIAC) */
3507 u8 lap[3] = { 0x33, 0x8b, 0x9e };
3508 struct hci_cp_inquiry cp;
3509
3510 BT_DBG("%s", hdev->name);
3511
3512 if (test_bit(HCI_INQUIRY, &hdev->flags))
3513 return -EINPROGRESS;
3514
3515 hci_inquiry_cache_flush(hdev);
3516
3517 memset(&cp, 0, sizeof(cp));
3518 memcpy(&cp.lap, lap, sizeof(cp.lap));
3519 cp.length = length;
3520
3521 return hci_send_cmd(hdev, HCI_OP_INQUIRY, sizeof(cp), &cp);
3522}
3523
3524int hci_cancel_inquiry(struct hci_dev *hdev)
3525{
3526 BT_DBG("%s", hdev->name);
3527
3528 if (!test_bit(HCI_INQUIRY, &hdev->flags))
3529 return -EALREADY;
3530
3531 return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);
3532}
3533
3534u8 bdaddr_to_le(u8 bdaddr_type) 3504u8 bdaddr_to_le(u8 bdaddr_type)
3535{ 3505{
3536 switch (bdaddr_type) { 3506 switch (bdaddr_type) {