Bluetooth: Remove unneeded hci_req_cmd_status function

This patch removes the hci_req_cmd_status function since it is not
used anymore. The HCI request framework now considers the HCI command
has complete once the Command Status or Command Complete Event is
received.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 358a6983d3bb998024db7deaad1cb578028ff77e..0e7ee892d7aba678876328457e79c777aeb2a4a8 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1055,7 +1055,6 @@ void hci_req_init(struct hci_request *req, struct hci_dev *hdev);
 int hci_req_run(struct hci_request *req, hci_req_complete_t complete);
 void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);
 void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status);
-void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status);
 
 int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);
 void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags);

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 123992984a7c1271414b28dae7aaaffe41ab2c3d..a199d631e31cfd8cc82b0a509e12debf9a0bce2f 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3322,32 +3322,6 @@ call_complete:
                req_complete(hdev, status);
 }
 
-void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status)
-{
-       hci_req_complete_t req_complete = NULL;
-
-       BT_DBG("opcode 0x%04x status 0x%02x", opcode, status);
-
-       if (status) {
-               hci_req_cmd_complete(hdev, opcode, status);
-               return;
-       }
-
-       /* No need to handle success status if there are more commands */
-       if (!hci_req_is_complete(hdev))
-               return;
-
-       if (hdev->sent_cmd)
-               req_complete = bt_cb(hdev->sent_cmd)->req.complete;
-
-       /* If the request doesn't have a complete callback or there
-        * are other commands/requests in the hdev queue we consider
-        * this request as completed.
-        */
-       if (!req_complete || !skb_queue_empty(&hdev->cmd_q))
-               hci_req_cmd_complete(hdev, opcode, status);
-}
-
 static void hci_rx_work(struct work_struct *work)
 {
        struct hci_dev *hdev = container_of(work, struct hci_dev, rx_work);