Bluetooth: Make mgmt_device_found() return void
Subsystems (2)
Marcel Holtmann
maintainerPATCH 7/9 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 <[email protected]>
--- include/net/bluetooth/hci_core.h | 6 +++--- net/bluetooth/mgmt.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-)
include/net/bluetooth/hci_core.h +3 -3
@@ -1140,9 +1140,9 @@ int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,int mgmt_set_local_name_complete (struct hci_dev *hdev,u8 *name,u8 status);int mgmt_read_local_oob_data_reply_complete (struct hci_dev *hdev,u8 *hash,u8 *randomizer,u8 status); -int mgmt_device_found (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type, -u8 addr_type,u8 *dev_class,s8 rssi,u8 cfm_name, -u8 ssp,u8 *eir,u16 eir_len); +void mgmt_device_found (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type, +u8 addr_type,u8 *dev_class,s8 rssi,u8 cfm_name, +u8 ssp,u8 *eir,u16 eir_len);int mgmt_remote_name (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type,u8 addr_type,s8 rssi,u8 *name,u8 name_len);int mgmt_discovering (struct hci_dev *hdev,u8 discovering);
net/bluetooth/mgmt.c +6 -6
@@ -4524,20 +4524,20 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,return err; } -int mgmt_device_found (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type, -u8 addr_type,u8 *dev_class,s8 rssi,u8 cfm_name,u8 - ssp,u8 *eir,u16 eir_len) +void mgmt_device_found (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type, +u8 addr_type,u8 *dev_class,s8 rssi,u8 cfm_name,u8 + ssp,u8 *eir,u16 eir_len) {char buf[512 ];struct mgmt_ev_device_found *ev = (void *) buf;size_t ev_size;if (!hci_discovery_active (hdev)) -return -EPERM ; +return ;/* Leave 5 bytes for a potential CoD field */ if (sizeof (*ev) + eir_len +5 >sizeof (buf)) -return -EINVAL ; +return ;memset (buf,0 ,sizeof (buf));
@@ -4559,7 +4559,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, ev->eir_len =cpu_to_le16 (eir_len); ev_size =sizeof (*ev) + eir_len; -return mgmt_event (MGMT_EV_DEVICE_FOUND , hdev, ev, ev_size,NULL ); +mgmt_event (MGMT_EV_DEVICE_FOUND , hdev, ev, ev_size,NULL ); } int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
Signature · 1 line
1.8.3.1