Bluetooth: Move hci_amp_capable() function into L2CAP core
Subsystems (2)
Marcel Holtmann
maintainerPATCH 9/10 Bluetooth: Move hci_amp_capable() function into L2CAP core
The hci_amp_capable() function has only a single user inside the L2CAP core. Instead of exporting the function, place it next to its user.
Signed-off-by Marcel Holtmann <[email protected]>
--- include/net/bluetooth/hci_core.h | 16 ---------------- net/bluetooth/l2cap_core.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-)
include/net/bluetooth/hci_core.h +0 -16
@@ -797,22 +797,6 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define lmp_host_le_capable (dev) (!!((dev)->features[1][0] & LMP_HOST_LE))#define lmp_host_le_br_capable (dev) (!!((dev)->features[1][0] & LMP_HOST_LE_BREDR)) -/* returns true if at least one AMP active */ -static inline bool hci_amp_capable (void ) -{ -struct hci_dev *hdev; -bool ret = false; - -read_lock (&hci_dev_list_lock); -list_for_each_entry (hdev, &hci_dev_list, list) -if (hdev->amp_type !=AMP_TYPE_BREDR && -test_bit (HCI_UP , &hdev->flags)) - ret = true; -read_unlock (&hci_dev_list_lock); - -return ret; -} -/* ----- HCI protocols ----- */ #define HCI_PROTO_DEFER 0x01
net/bluetooth/l2cap_core.c +16 -0
@@ -1012,6 +1012,22 @@ static inline int __l2cap_no_conn_pending(struct l2cap_chan *chan)return !test_bit (CONF_CONNECT_PEND , &chan->conf_state); } +/* returns true if at least one AMP active */ +static inline bool hci_amp_capable (void ) +{ +struct hci_dev *hdev; +bool ret = false; + +read_lock (&hci_dev_list_lock); +list_for_each_entry (hdev, &hci_dev_list, list) +if (hdev->amp_type !=AMP_TYPE_BREDR && +test_bit (HCI_UP , &hdev->flags)) + ret = true; +read_unlock (&hci_dev_list_lock); + +return ret; +} +static bool __amp_capable (struct l2cap_chan *chan) {struct l2cap_conn *conn = chan->conn;
Signature · 1 line
1.8.3.1