Bluetooth: Make mgmt_disconnect_failed() return void
Subsystems (2)
Marcel Holtmann
maintainerPATCH 3/9 Bluetooth: Make mgmt_disconnect_failed() return void
The return value of mgmt_disconnect_failed() function is not used so change it to just return void.
Signed-off-by Marcel Holtmann <[email protected]>
--- include/net/bluetooth/hci_core.h | 4 ++-- net/bluetooth/mgmt.c | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-)
include/net/bluetooth/hci_core.h +2 -2
@@ -1106,8 +1106,8 @@ int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, u8 *dev_class);int mgmt_device_disconnected (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type,u8 addr_type,u8 reason); -int mgmt_disconnect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr, -u8 link_type,u8 addr_type,u8 status); +void mgmt_disconnect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr, +u8 link_type,u8 addr_type,u8 status);int mgmt_connect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 link_type,u8 addr_type,u8 status);int mgmt_pin_code_request (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 secure);
net/bluetooth/mgmt.c +5 -8
@@ -4143,29 +4143,26 @@ int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,return err; } -int mgmt_disconnect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr, -u8 link_type,u8 addr_type,u8 status) +void mgmt_disconnect_failed (struct hci_dev *hdev,bdaddr_t *bdaddr, +u8 link_type,u8 addr_type,u8 status) {struct mgmt_rp_disconnect rp;struct pending_cmd *cmd; -int err;mgmt_pending_foreach (MGMT_OP_UNPAIR_DEVICE , hdev, unpair_device_rsp, hdev); cmd =mgmt_pending_find (MGMT_OP_DISCONNECT , hdev);if (!cmd) -return -ENOENT ; +return ;bacpy (&rp.addr.bdaddr, bdaddr); rp.addr.type =link_to_bdaddr (link_type, addr_type); - err =cmd_complete (cmd->sk, cmd->index,MGMT_OP_DISCONNECT , -mgmt_status (status), &rp,sizeof (rp)); +cmd_complete (cmd->sk, cmd->index,MGMT_OP_DISCONNECT , +mgmt_status (status), &rp,sizeof (rp));mgmt_pending_remove (cmd); - -return err; } int mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
Signature · 1 line
1.8.3.1