aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-07 02:55:51 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-07 03:19:23 -0400
commit901801b9a420e58969e039731dd007ae104842d3 (patch)
tree2767d16eb91d8d966bab9b3d864fb89646f11bba /net
parent9b80ec5e8e66ada404ad65ce61a1de70fee0fbbd (diff)
Bluetooth: Make mgmt_device_found() return void
The return value of mgmt_device_found() function is not used and so just change it to return void. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b9cd5829672e..abf500b3b265 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4524,20 +4524,20 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
4524 return err; 4524 return err;
4525} 4525}
4526 4526
4527int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 4527void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
4528 u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name, u8 4528 u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name, u8
4529 ssp, u8 *eir, u16 eir_len) 4529 ssp, u8 *eir, u16 eir_len)
4530{ 4530{
4531 char buf[512]; 4531 char buf[512];
4532 struct mgmt_ev_device_found *ev = (void *) buf; 4532 struct mgmt_ev_device_found *ev = (void *) buf;
4533 size_t ev_size; 4533 size_t ev_size;
4534 4534
4535 if (!hci_discovery_active(hdev)) 4535 if (!hci_discovery_active(hdev))
4536 return -EPERM; 4536 return;
4537 4537
4538 /* Leave 5 bytes for a potential CoD field */ 4538 /* Leave 5 bytes for a potential CoD field */
4539 if (sizeof(*ev) + eir_len + 5 > sizeof(buf)) 4539 if (sizeof(*ev) + eir_len + 5 > sizeof(buf))
4540 return -EINVAL; 4540 return;
4541 4541
4542 memset(buf, 0, sizeof(buf)); 4542 memset(buf, 0, sizeof(buf));
4543 4543
@@ -4559,7 +4559,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
4559 ev->eir_len = cpu_to_le16(eir_len); 4559 ev->eir_len = cpu_to_le16(eir_len);
4560 ev_size = sizeof(*ev) + eir_len; 4560 ev_size = sizeof(*ev) + eir_len;
4561 4561
4562 return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL); 4562 mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL);
4563} 4563}
4564 4564
4565int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 4565int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,