Commit 7892924c authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 3eec705e

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ 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,

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);

net/bluetooth/mgmt.c

+5 −8
Original line number Diff line number Diff line
@@ -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,

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,

	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,