2 files changed, 16 insertions, 16 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 4cb355b023a4..82c397451261 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -795,22 +795,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
 
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index b0208e20390c..2efdb17d87a3 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -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;