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

Commit 7667da34 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

Bluetooth: Make mgmt_set_local_name_complete() return void 



The return value of mgmt_set_local_name_complete() 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 avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 4e1b0245

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); 
void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);

void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,

				    u8 status);

int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);

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

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

net/bluetooth/mgmt.c

+5 −5
Original line number Diff line number Diff line
@@ -4813,13 +4813,13 @@ void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, 
		sock_put(match.sk);

}



int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)

void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)

{

	struct mgmt_cp_set_local_name ev;

	struct pending_cmd *cmd;



	if (status)

		return 0;

		return;



	memset(&ev, 0, sizeof(ev));

	memcpy(ev.name, name, HCI_MAX_NAME_LENGTH);
@@ -4833,10 +4833,10 @@ int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status) 
		 * HCI dev don't send any mgmt signals.

		 */

		if (mgmt_pending_find(MGMT_OP_SET_POWERED, hdev))

			return 0;

			return;

	}



	return mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),

	mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),

		   cmd ? cmd->sk : NULL);

}