Commit 2f1e063b authored Oct 06, 2013 by Marcel Holtmann Committed by Johan Hedberg Oct 07, 2013

Bluetooth: Make mgmt_discovering() return void



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

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

parent 9cf12aee

include/net/bluetooth/hci_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1145,7 +1145,7 @@ void mgmt_device_found(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		u8 ssp, u8 *eir, u16 eir_len);
		void mgmt_remote_name(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		u8 addr_type, s8 rssi, u8 *name, u8 name_len);
		int mgmt_discovering(struct hci_dev *hdev, u8 discovering);
		void mgmt_discovering(struct hci_dev *hdev, u8 discovering);
		int mgmt_device_blocked(struct hci_dev hdev, bdaddr_t bdaddr, u8 type);
		int mgmt_device_unblocked(struct hci_dev hdev, bdaddr_t bdaddr, u8 type);
		int mgmt_new_ltk(struct hci_dev hdev, struct smp_ltk key, u8 persistent);

net/bluetooth/mgmt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4585,7 +4585,7 @@ void mgmt_remote_name(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type,
		mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL);
		}

		int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
		void mgmt_discovering(struct hci_dev *hdev, u8 discovering)
		{
		struct mgmt_ev_discovering ev;
		struct pending_cmd *cmd;
		@@ -4609,7 +4609,7 @@ int mgmt_discovering(struct hci_dev *hdev, u8 discovering)
		ev.type = hdev->discovery.type;
		ev.discovering = discovering;

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

		int mgmt_device_blocked(struct hci_dev hdev, bdaddr_t bdaddr, u8 type)