diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-04 05:37:22 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-04 05:58:09 -0400 |
| commit | ae44e5d19e870385d1e73ce248c19ea4761bb40c (patch) | |
| tree | d61ab274ae8e93a6525f439842bb107c965782e2 | |
| parent | 95305baa779223060c7129100424da6c0d01045b (diff) | |
Bluetooth: Remove unused hci_pend_le_conn_del() function
Now that there are no-longer any users of the hci_pend_le_conn_del()
function we can simply go ahead and remove it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 | ||||
| -rw-r--r-- | net/bluetooth/hci_core.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 9670f4c66ee3..758146c513d3 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -871,7 +871,6 @@ void hci_conn_params_clear_enabled(struct hci_dev *hdev); | |||
| 871 | struct hci_conn_params *hci_pend_le_conn_lookup(struct hci_dev *hdev, | 871 | struct hci_conn_params *hci_pend_le_conn_lookup(struct hci_dev *hdev, |
| 872 | bdaddr_t *addr, u8 addr_type); | 872 | bdaddr_t *addr, u8 addr_type); |
| 873 | void hci_pend_le_conn_add(struct hci_dev *hdev, struct hci_conn_params *params); | 873 | void hci_pend_le_conn_add(struct hci_dev *hdev, struct hci_conn_params *params); |
| 874 | void hci_pend_le_conn_del(struct hci_dev *hdev, struct hci_conn_params *params); | ||
| 875 | void hci_pend_le_conns_clear(struct hci_dev *hdev); | 874 | void hci_pend_le_conns_clear(struct hci_dev *hdev); |
| 876 | 875 | ||
| 877 | void hci_update_background_scan(struct hci_dev *hdev); | 876 | void hci_update_background_scan(struct hci_dev *hdev); |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 3b0da6eeb449..6eadde820333 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -3461,16 +3461,6 @@ void hci_pend_le_conn_add(struct hci_dev *hdev, struct hci_conn_params *params) | |||
| 3461 | } | 3461 | } |
| 3462 | 3462 | ||
| 3463 | /* This function requires the caller holds hdev->lock */ | 3463 | /* This function requires the caller holds hdev->lock */ |
| 3464 | void hci_pend_le_conn_del(struct hci_dev *hdev, struct hci_conn_params *params) | ||
| 3465 | { | ||
| 3466 | list_del_init(¶ms->action); | ||
| 3467 | |||
| 3468 | BT_DBG("addr %pMR (type %u)", ¶ms->addr, params->addr_type); | ||
| 3469 | |||
| 3470 | hci_update_background_scan(hdev); | ||
| 3471 | } | ||
| 3472 | |||
| 3473 | /* This function requires the caller holds hdev->lock */ | ||
| 3474 | void hci_pend_le_conns_clear(struct hci_dev *hdev) | 3464 | void hci_pend_le_conns_clear(struct hci_dev *hdev) |
| 3475 | { | 3465 | { |
| 3476 | while (!list_empty(&hdev->pend_le_conns)) | 3466 | while (!list_empty(&hdev->pend_le_conns)) |
