aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2013-03-27 19:04:57 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2013-04-04 04:12:34 -0400
commitd4299ce6b33c0afd22cf6a170cfaf89c63d1114d (patch)
treef8b1671ea0ccd1173c31f866875c82c431f26381
parent3e13fa1e1fab479940728272b6425d343e0c0f84 (diff)
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>
-rw-r--r--include/net/bluetooth/hci_core.h1
-rw-r--r--net/bluetooth/hci_core.c26
2 files changed, 0 insertions, 27 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 358a6983d3bb..0e7ee892d7ab 100644
--- 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);
1055int hci_req_run(struct hci_request *req, hci_req_complete_t complete); 1055int hci_req_run(struct hci_request *req, hci_req_complete_t complete);
1056void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param); 1056void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);
1057void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status); 1057void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status);
1058void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status);
1059 1058
1060int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param); 1059int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);
1061void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags); 1060void 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 123992984a7c..a199d631e31c 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3322,32 +3322,6 @@ call_complete:
3322 req_complete(hdev, status); 3322 req_complete(hdev, status);
3323} 3323}
3324 3324
3325void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status)
3326{
3327 hci_req_complete_t req_complete = NULL;
3328
3329 BT_DBG("opcode 0x%04x status 0x%02x", opcode, status);
3330
3331 if (status) {
3332 hci_req_cmd_complete(hdev, opcode, status);
3333 return;
3334 }
3335
3336 /* No need to handle success status if there are more commands */
3337 if (!hci_req_is_complete(hdev))
3338 return;
3339
3340 if (hdev->sent_cmd)
3341 req_complete = bt_cb(hdev->sent_cmd)->req.complete;
3342
3343 /* If the request doesn't have a complete callback or there
3344 * are other commands/requests in the hdev queue we consider
3345 * this request as completed.
3346 */
3347 if (!req_complete || !skb_queue_empty(&hdev->cmd_q))
3348 hci_req_cmd_complete(hdev, opcode, status);
3349}
3350
3351static void hci_rx_work(struct work_struct *work) 3325static void hci_rx_work(struct work_struct *work)
3352{ 3326{
3353 struct hci_dev *hdev = container_of(work, struct hci_dev, rx_work); 3327 struct hci_dev *hdev = container_of(work, struct hci_dev, rx_work);