Commit 9b80ec5e authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Make mgmt_device_disconnected() return void 



The return value of mgmt_device_disconnected() function is not used
and so just change it to return void.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent ecd90ae7

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, 
void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

			   u8 addr_type, u32 flags, u8 *name, u8 name_len,

			   u8 *dev_class);

int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,

void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,

			      u8 link_type, u8 addr_type, u8 reason);

void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 link_type, u8 addr_type, u8 status);

net/bluetooth/mgmt.c

+3 −7
Original line number Diff line number Diff line
@@ -4118,12 +4118,11 @@ static void unpair_device_rsp(struct pending_cmd *cmd, void *data) 
	mgmt_pending_remove(cmd);

}



int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,

void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,

			      u8 link_type, u8 addr_type, u8 reason)

{

	struct mgmt_ev_device_disconnected ev;

	struct sock *sk = NULL;

	int err;



	mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &sk);
@@ -4131,16 +4130,13 @@ int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	ev.reason = reason;



	err = mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev),

			 sk);

	mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev), sk);



	if (sk)

		sock_put(sk);



	mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,

			     hdev);



	return err;

}



void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,