2 files changed, 27 insertions, 26 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 9f5f2c1c5554..5ca9219fe940 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -131,6 +131,33 @@ enum {
         BT_CLOSED
 };
 
+/* If unused will be removed by compiler */
+static inline const char *state_to_string(int state)
+{
+        switch (state) {
+        case BT_CONNECTED:
+                return "BT_CONNECTED";
+        case BT_OPEN:
+                return "BT_OPEN";
+        case BT_BOUND:
+                return "BT_BOUND";
+        case BT_LISTEN:
+                return "BT_LISTEN";
+        case BT_CONNECT:
+                return "BT_CONNECT";
+        case BT_CONNECT2:
+                return "BT_CONNECT2";
+        case BT_CONFIG:
+                return "BT_CONFIG";
+        case BT_DISCONN:
+                return "BT_DISCONN";
+        case BT_CLOSED:
+                return "BT_CLOSED";
+        }
+
+        return "invalid state";
+}
+
 /* BD Address */
 typedef struct {
         __u8 b[6];
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8efac7884ffb..252a96e474ca 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -215,32 +215,6 @@ static u16 l2cap_alloc_cid(struct l2cap_conn *conn)
         return 0;
 }
 
-static char *state_to_string(int state)
-{
-        switch(state) {
-        case BT_CONNECTED:
-                return "BT_CONNECTED";
-        case BT_OPEN:
-                return "BT_OPEN";
-        case BT_BOUND:
-                return "BT_BOUND";
-        case BT_LISTEN:
-                return "BT_LISTEN";
-        case BT_CONNECT:
-                return "BT_CONNECT";
-        case BT_CONNECT2:
-                return "BT_CONNECT2";
-        case BT_CONFIG:
-                return "BT_CONFIG";
-        case BT_DISCONN:
-                return "BT_DISCONN";
-        case BT_CLOSED:
-                return "BT_CLOSED";
-        }
-
-        return "invalid state";
-}
-
 static void l2cap_state_change(struct l2cap_chan *chan, int state)
 {
         BT_DBG("%p %s -> %s", chan, state_to_string(chan->state),