Bluetooth: Move struct sco_conn into net/bluetooth/sco.c

There exists no external user of struct sco_conn and thus move
it into the one place that is actually using it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
index 7fec7cbd7396dea01c1925aa4cec883aad615efd..42a0d089d715063b02550d916229f5c3f2ac02f2 100644 (file)
--- a/include/net/bluetooth/sco.h
+++ b/include/net/bluetooth/sco.h
@@ -51,17 +51,4 @@ struct sco_conninfo {
        __u8  dev_class[3];
 };
 
-/* ---- SCO connections ---- */
-struct sco_conn {
-       struct hci_conn *hcon;
-
-       spinlock_t      lock;
-       struct sock     *sk;
-
-       unsigned int    mtu;
-};
-
-#define sco_conn_lock(c)       spin_lock(&c->lock);
-#define sco_conn_unlock(c)     spin_unlock(&c->lock);
-
 #endif /* __SCO_H */

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index c71698642ec6c9d3e6f2ca7f7f1459649d57e1c0..9868ec7c7dc47f37bdc3d1da25718e39dbab9490 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -40,6 +40,19 @@ static struct bt_sock_list sco_sk_list = {
        .lock = __RW_LOCK_UNLOCKED(sco_sk_list.lock)
 };
 
+/* ---- SCO connections ---- */
+struct sco_conn {
+       struct hci_conn *hcon;
+
+       spinlock_t      lock;
+       struct sock     *sk;
+
+       unsigned int    mtu;
+};
+
+#define sco_conn_lock(c)       spin_lock(&c->lock);
+#define sco_conn_unlock(c)     spin_unlock(&c->lock);
+
 static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);
 static void sco_chan_del(struct sock *sk, int err);