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

Commit 3eb38528 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

Bluetooth: Make mgmt_pin_code_neg_reply_complete() return void 



The return value of mgmt_pin_code_neg_reply_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 e669cf80

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
void mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure);

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

				  u8 status);

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

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

				      u8 status);

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

			      u8 link_type, u8 addr_type, __le32 value,

net/bluetooth/mgmt.c

+5 −8
Original line number Diff line number Diff line
@@ -4563,26 +4563,23 @@ void mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	mgmt_pending_remove(cmd);

}



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

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

				      u8 status)

{

	struct pending_cmd *cmd;

	struct mgmt_rp_pin_code_reply rp;

	int err;



	cmd = mgmt_pending_find(MGMT_OP_PIN_CODE_NEG_REPLY, hdev);

	if (!cmd)

		return -ENOENT;

		return;



	bacpy(&rp.addr.bdaddr, bdaddr);

	rp.addr.type = BDADDR_BREDR;



	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,

	cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,

		     mgmt_status(status), &rp, sizeof(rp));



	mgmt_pending_remove(cmd);



	return err;

}



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