Merge tag 'for_linus-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jwess...

[karo-tx-linux.git] / net / x25 / x25_link.c

diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 4acacf3c6617b7f21930885930bae094abfcea14..fd5ffb25873f35c981ec5b245d0670338dbcda12 100644 (file)
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -21,6 +21,8 @@
  *     2000-09-04      Henner Eisen      dev_hold() / dev_put() for x25_neigh.
  */
 
+#define pr_fmt(fmt) "X25: " fmt
+
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
 #include <linux/timer.h>
@@ -93,13 +95,13 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,
                if (!pskb_may_pull(skb, X25_STD_MIN_LEN + 4))
                        break;
 
-               printk(KERN_WARNING "x25: diagnostic #%d - %02X %02X %02X\n",
+               pr_warn("diagnostic #%d - %02X %02X %02X\n",
                       skb->data[3], skb->data[4],
                       skb->data[5], skb->data[6]);
                break;
 
        default:
-               printk(KERN_WARNING "x25: received unknown %02X with LCI 000\n",
+               pr_warn("received unknown %02X with LCI 000\n",
                       frametype);
                break;
        }