Commit 445608d0 authored Oct 06, 2013 by Marcel Holtmann Committed by Johan Hedberg Oct 07, 2013

Bluetooth: Make mgmt_connect_failed() return void



The return value of mgmt_connect_failed() function is not used
so change it to just return void.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

parent 7892924c

include/net/bluetooth/hci_core.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1108,7 +1108,7 @@ int mgmt_device_disconnected(struct hci_dev hdev, bdaddr_t bdaddr,
		u8 link_type, u8 addr_type, u8 reason);
		void mgmt_disconnect_failed(struct hci_dev hdev, bdaddr_t bdaddr,
		u8 link_type, u8 addr_type, u8 status);
		int mgmt_connect_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		void mgmt_connect_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		u8 addr_type, u8 status);
		int mgmt_pin_code_request(struct hci_dev hdev, bdaddr_t bdaddr, u8 secure);
		int mgmt_pin_code_reply_complete(struct hci_dev hdev, bdaddr_t bdaddr,

net/bluetooth/mgmt.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -4165,7 +4165,7 @@ void mgmt_disconnect_failed(struct hci_dev hdev, bdaddr_t bdaddr,
		mgmt_pending_remove(cmd);
		}

		int mgmt_connect_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		void mgmt_connect_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		u8 addr_type, u8 status)
		{
		struct mgmt_ev_connect_failed ev;
		@@ -4174,7 +4174,7 @@ int mgmt_connect_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		ev.addr.type = link_to_bdaddr(link_type, addr_type);
		ev.status = mgmt_status(status);

		return mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL);
		mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL);
		}

		int mgmt_pin_code_request(struct hci_dev hdev, bdaddr_t bdaddr, u8 secure)