Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4796e8af authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Make mgmt_write_scan_failed() return void 



The return value of mgmt_write_scan_failed() 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 a330916c

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ void mgmt_set_powered_failed(struct hci_dev *hdev, int err); 
int mgmt_powered(struct hci_dev *hdev, u8 powered);

void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);

void mgmt_connectable(struct hci_dev *hdev, u8 connectable);

int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

		      bool persistent);

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

net/bluetooth/mgmt.c

+1 −3
Original line number Diff line number Diff line
@@ -4267,7 +4267,7 @@ void mgmt_connectable(struct hci_dev *hdev, u8 connectable) 
		new_settings(hdev, NULL);

}



int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status)

void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status)

{

	u8 mgmt_err = mgmt_status(status);
@@ -4278,8 +4278,6 @@ int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status) 
	if (scan & SCAN_INQUIRY)

		mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev,

				     cmd_status_rsp, &mgmt_err);



	return 0;

}



int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,