aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-15 17:26:28 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-10-15 19:54:49 -0400
commit3edaf092c271d91228c66a48b415c92925b83d0b (patch)
tree57f9a44180715d72e13df929811280716599cdd2
parent7667da3423cdf06a818e73adaf2f675455cc8e99 (diff)
Bluetooth: Make mgmt_read_local_oob_data_reply_complete() return void
The return value of mgmt_read_local_oob_data_reply_complete() function is not used and so just change it to return void. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--include/net/bluetooth/hci_core.h4
-rw-r--r--net/bluetooth/mgmt.c18
2 files changed, 9 insertions, 13 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d40212b94c8a..5d8d322a0855 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1115,8 +1115,8 @@ void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);
1115void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, 1115void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
1116 u8 status); 1116 u8 status);
1117void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status); 1117void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
1118int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 1118void mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
1119 u8 *randomizer, u8 status); 1119 u8 *randomizer, u8 status);
1120void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 1120void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
1121 u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name, 1121 u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name,
1122 u8 ssp, u8 *eir, u16 eir_len); 1122 u8 ssp, u8 *eir, u16 eir_len);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b4b5cb7786df..1ed0b3e1b9ff 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4840,35 +4840,31 @@ void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
4840 cmd ? cmd->sk : NULL); 4840 cmd ? cmd->sk : NULL);
4841} 4841}
4842 4842
4843int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 4843void mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
4844 u8 *randomizer, u8 status) 4844 u8 *randomizer, u8 status)
4845{ 4845{
4846 struct pending_cmd *cmd; 4846 struct pending_cmd *cmd;
4847 int err;
4848 4847
4849 BT_DBG("%s status %u", hdev->name, status); 4848 BT_DBG("%s status %u", hdev->name, status);
4850 4849
4851 cmd = mgmt_pending_find(MGMT_OP_READ_LOCAL_OOB_DATA, hdev); 4850 cmd = mgmt_pending_find(MGMT_OP_READ_LOCAL_OOB_DATA, hdev);
4852 if (!cmd) 4851 if (!cmd)
4853 return -ENOENT; 4852 return;
4854 4853
4855 if (status) { 4854 if (status) {
4856 err = cmd_status(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA, 4855 cmd_status(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA,
4857 mgmt_status(status)); 4856 mgmt_status(status));
4858 } else { 4857 } else {
4859 struct mgmt_rp_read_local_oob_data rp; 4858 struct mgmt_rp_read_local_oob_data rp;
4860 4859
4861 memcpy(rp.hash, hash, sizeof(rp.hash)); 4860 memcpy(rp.hash, hash, sizeof(rp.hash));
4862 memcpy(rp.randomizer, randomizer, sizeof(rp.randomizer)); 4861 memcpy(rp.randomizer, randomizer, sizeof(rp.randomizer));
4863 4862
4864 err = cmd_complete(cmd->sk, hdev->id, 4863 cmd_complete(cmd->sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_DATA,
4865 MGMT_OP_READ_LOCAL_OOB_DATA, 0, &rp, 4864 0, &rp, sizeof(rp));
4866 sizeof(rp));
4867 } 4865 }
4868 4866
4869 mgmt_pending_remove(cmd); 4867 mgmt_pending_remove(cmd);
4870
4871 return err;
4872} 4868}
4873 4869
4874void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 4870void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,