Bluetooth: Make hci_req_add returning void

Since no one checks the returning value of hci_req_add and HCI
request errors are now handled in hci_req_run, we can make hci_
req_add returning void.

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>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 332ee5099a52ad0104caa4b015dfad0140c959ef..d6c32561fc025b618779177b5acb988da7f740ab 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1051,7 +1051,7 @@ struct hci_request {
 
 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);
-int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);
+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);
 

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b432baafdf12f6c1363663dde4e2a7f5a35c6d8f..1c678757c83a10940c25fb6d8a19279e2e53feeb 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2529,7 +2529,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)
 }
 
 /* Queue a command to an asynchronous HCI request */
-int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param)
+void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param)
 {
        struct hci_dev *hdev = req->hdev;
        struct sk_buff *skb;
@@ -2541,15 +2541,13 @@ int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param)
                BT_ERR("%s no memory for command (opcode 0x%4.4x)",
                       hdev->name, opcode);
                req->err = -ENOMEM;
-               return -ENOMEM;
+               return;
        }
 
        if (skb_queue_empty(&req->cmd_q))
                bt_cb(skb)->req.start = true;
 
        skb_queue_tail(&req->cmd_q, skb);
-
-       return 0;
 }
 
 /* Get data from the previously sent command */