Commit 901801b9 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Make mgmt_device_found() return void 



The return value of mgmt_device_found() 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 9b80ec5e

include/net/bluetooth/hci_core.h

+3 −3
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, 
int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);

int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

					    u8 *randomizer, u8 status);

int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

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,

net/bluetooth/mgmt.c

+6 −6
Original line number Diff line number Diff line
@@ -4524,7 +4524,7 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 
	return err;

}



int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

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)

{
@@ -4533,11 +4533,11 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	size_t ev_size;



	if (!hci_discovery_active(hdev))

		return -EPERM;

		return;



	/* Leave 5 bytes for a potential CoD field */

	if (sizeof(*ev) + eir_len + 5 > sizeof(buf))

		return -EINVAL;

		return;



	memset(buf, 0, sizeof(buf));
@@ -4559,7 +4559,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	ev->eir_len = cpu_to_le16(eir_len);

	ev_size = sizeof(*ev) + eir_len;



	return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL);

	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,