Commit b05ce889 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci: Remove deadcode 



hci_bdaddr_list_del_with_flags() was added in 2020's
commit 8baaa403 ("Bluetooth: Add bdaddr_list_with_flags for classic
whitelist")
but has remained unused.

hci_remove_ext_adv_instance() was added in 2020's
commit eca0ae4a ("Bluetooth: Add initial implementation of BIS
connections")
but has remained unused.

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent e209e5cc

include/net/bluetooth/hci_core.h

+0 −2
Original line number Diff line number Diff line
@@ -1760,8 +1760,6 @@ int hci_bdaddr_list_add_with_flags(struct list_head *list, bdaddr_t *bdaddr, 
int hci_bdaddr_list_del(struct list_head *list, bdaddr_t *bdaddr, u8 type);

int hci_bdaddr_list_del_with_irk(struct list_head *list, bdaddr_t *bdaddr,

				 u8 type);

int hci_bdaddr_list_del_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				   u8 type);

void hci_bdaddr_list_clear(struct list_head *list);



struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,

include/net/bluetooth/hci_sync.h

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ int hci_update_scan(struct hci_dev *hdev); 
int hci_write_le_host_supported_sync(struct hci_dev *hdev, u8 le, u8 simul);

int hci_remove_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance,

				     struct sock *sk);

int hci_remove_ext_adv_instance(struct hci_dev *hdev, u8 instance);

struct sk_buff *hci_read_local_oob_data_sync(struct hci_dev *hdev, bool ext,

					     struct sock *sk);

net/bluetooth/hci_core.c

+0 −20
Original line number Diff line number Diff line
@@ -2181,26 +2181,6 @@ int hci_bdaddr_list_del_with_irk(struct list_head *list, bdaddr_t *bdaddr, 
	return 0;

}



int hci_bdaddr_list_del_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				   u8 type)

{

	struct bdaddr_list_with_flags *entry;



	if (!bacmp(bdaddr, BDADDR_ANY)) {

		hci_bdaddr_list_clear(list);

		return 0;

	}



	entry = hci_bdaddr_list_lookup_with_flags(list, bdaddr, type);

	if (!entry)

		return -ENOENT;



	list_del(&entry->list);

	kfree(entry);



	return 0;

}



/* This function requires the caller holds hdev->lock */

struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,

					       bdaddr_t *addr, u8 addr_type)

net/bluetooth/hci_sync.c

+0 −24
Original line number Diff line number Diff line
@@ -1786,30 +1786,6 @@ int hci_remove_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance, 
					HCI_CMD_TIMEOUT, sk);

}



static int remove_ext_adv_sync(struct hci_dev *hdev, void *data)

{

	struct adv_info *adv = data;

	u8 instance = 0;



	if (adv)

		instance = adv->instance;



	return hci_remove_ext_adv_instance_sync(hdev, instance, NULL);

}



int hci_remove_ext_adv_instance(struct hci_dev *hdev, u8 instance)

{

	struct adv_info *adv = NULL;



	if (instance) {

		adv = hci_find_adv_instance(hdev, instance);

		if (!adv)

			return -EINVAL;

	}



	return hci_cmd_sync_queue(hdev, remove_ext_adv_sync, adv, NULL);

}



int hci_le_terminate_big_sync(struct hci_dev *hdev, u8 handle, u8 reason)

{

	struct hci_cp_le_term_big cp;