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

There exists no external user of struct sco_pinfo and sco_pi 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 2019d1a..7fec7cb 100644 (file)
--- a/include/net/bluetooth/sco.h
+++ b/include/net/bluetooth/sco.h
@@ -64,16 +64,4 @@ struct sco_conn {
 #define sco_conn_lock(c)       spin_lock(&c->lock);
 #define sco_conn_unlock(c)     spin_unlock(&c->lock);
 
-/* ----- SCO socket info ----- */
-#define sco_pi(sk) ((struct sco_pinfo *) sk)
-
-struct sco_pinfo {
-       struct bt_sock  bt;
-       bdaddr_t        src;
-       bdaddr_t        dst;
-       __u32           flags;
-       __u16           setting;
-       struct sco_conn *conn;
-};
-
 #endif /* __SCO_H */

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index c06dbd3..c716986 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -46,6 +46,18 @@ static void sco_chan_del(struct sock *sk, int err);
 static void sco_sock_close(struct sock *sk);
 static void sco_sock_kill(struct sock *sk);
 
+/* ----- SCO socket info ----- */
+#define sco_pi(sk) ((struct sco_pinfo *) sk)
+
+struct sco_pinfo {
+       struct bt_sock  bt;
+       bdaddr_t        src;
+       bdaddr_t        dst;
+       __u32           flags;
+       __u16           setting;
+       struct sco_conn *conn;
+};
+
 /* ---- SCO timers ---- */
 static void sco_sock_timeout(unsigned long arg)
 {