Bluetooth: Make mgmt_index_added() and mgmt_index_removed() return void
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/9 Bluetooth: Make mgmt_index_added() and mgmt_index_removed() return void
The return value from mgmt_index_added() and mgmt_index_removed() functions is never used. So do not pretend that returning an error would actually be handled and just make both functions return void.
Signed-off-by Marcel Holtmann <[email protected]>
--- include/net/bluetooth/hci_core.h | 4 ++-- net/bluetooth/mgmt.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
include/net/bluetooth/hci_core.h +2 -2
@@ -1092,8 +1092,8 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event);#define DISCOV_BREDR_INQUIRY_LEN 0x08int mgmt_control (struct sock *sk,struct msghdr *msg,size_t len); -int mgmt_index_added (struct hci_dev *hdev); -int mgmt_index_removed (struct hci_dev *hdev); +void mgmt_index_added (struct hci_dev *hdev); +void mgmt_index_removed (struct hci_dev *hdev);int mgmt_set_powered_failed (struct hci_dev *hdev,int err);int mgmt_powered (struct hci_dev *hdev,u8 powered);int mgmt_discoverable (struct hci_dev *hdev,u8 discoverable);
net/bluetooth/mgmt.c +6 -6
@@ -3782,24 +3782,24 @@ done:return err; } -int mgmt_index_added (struct hci_dev *hdev) +void mgmt_index_added (struct hci_dev *hdev) {if (hdev->dev_type !=HCI_BREDR ) -return -ENOTSUPP ; +return ; -return mgmt_event (MGMT_EV_INDEX_ADDED , hdev,NULL ,0 ,NULL ); +mgmt_event (MGMT_EV_INDEX_ADDED , hdev,NULL ,0 ,NULL ); } -int mgmt_index_removed (struct hci_dev *hdev) +void mgmt_index_removed (struct hci_dev *hdev) {u8 status =MGMT_STATUS_INVALID_INDEX ;if (hdev->dev_type !=HCI_BREDR ) -return -ENOTSUPP ; +return ;mgmt_pending_foreach (0 , hdev, cmd_status_rsp, &status); -return mgmt_event (MGMT_EV_INDEX_REMOVED , hdev,NULL ,0 ,NULL ); +mgmt_event (MGMT_EV_INDEX_REMOVED , hdev,NULL ,0 ,NULL ); }static void set_bredr_scan (struct hci_request *req)
Signature · 1 line
1.8.3.1
Hi Marcel,
Quoted 9 lines · Marcel Holtmann
The return value from
mgmt_index_added()andmgmt_index_removed()functions is never used. So do not pretend that returning an error would actually be handled and just make both functions return void.Signed-off-by Marcel Holtmann <[email protected]>--- include/net/bluetooth/hci_core.h | 4 ++-- net/bluetooth/mgmt.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
All patches in this set have been applied to bluetooth-next. Thanks.
Johan