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

Bluetooth: Make mgmt_remote_name() return void 



The return value of mgmt_remote_name() 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 901801b9

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 
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,

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

int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

net/bluetooth/mgmt.c

+3 −4
Original line number Diff line number Diff line
@@ -4562,7 +4562,7 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	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,

void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		      u8 addr_type, s8 rssi, u8 *name, u8 name_len)

{

	struct mgmt_ev_device_found *ev;
@@ -4582,8 +4582,7 @@ int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 


	ev->eir_len = cpu_to_le16(eir_len);



	return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev,

			  sizeof(*ev) + eir_len, NULL);

	mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL);

}



int mgmt_discovering(struct hci_dev *hdev, u8 discovering)