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

Commit 41dc2bd6 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Make mgmt_start_discovery_failed static 



mgmt_start_discovery_failed is now only used in mgmt.c so we can
make it a local function. This patch also moves the mgmt_start_
discovery_failed definition up in mgmt.c to avoid forward
declaration.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent fef5234a

include/net/bluetooth/hci_core.h

+0 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,6 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
		      u8 ssp, u8 *eir, u16 eir_len);

int 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_start_discovery_failed(struct hci_dev *hdev, u8 status);

int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status);

int mgmt_discovering(struct hci_dev *hdev, u8 discovering);

int mgmt_interleaved_discovery(struct hci_dev *hdev);

net/bluetooth/mgmt.c

+21 −21
Original line number Diff line number Diff line
@@ -2650,6 +2650,27 @@ int mgmt_interleaved_discovery(struct hci_dev *hdev) 
	return err;

}



static int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status)

{

	struct pending_cmd *cmd;

	u8 type;

	int err;



	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);



	cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev);

	if (!cmd)

		return -ENOENT;



	type = hdev->discovery.type;



	err = cmd_complete(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status),

			   &type, sizeof(type));

	mgmt_pending_remove(cmd);



	return err;

}



static void start_discovery_complete(struct hci_dev *hdev, u8 status)

{

	BT_DBG("status %d", status);
@@ -4190,27 +4211,6 @@ int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
			  sizeof(*ev) + eir_len, NULL);

}



int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status)

{

	struct pending_cmd *cmd;

	u8 type;

	int err;



	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);



	cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev);

	if (!cmd)

		return -ENOENT;



	type = hdev->discovery.type;



	err = cmd_complete(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status),

			   &type, sizeof(type));

	mgmt_pending_remove(cmd);



	return err;

}



int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status)

{

	struct pending_cmd *cmd;