Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / net / x25 / x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index a8a236338e61e8c0de3b1d72a00186314dafb487..39231237e1c3b3806dc956429195a59edf46bfd6 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -17,6 +17,8 @@
  *      2000-09-04     Henner Eisen    Prevent freeing a dangling skb.
  */
 
+#define pr_fmt(fmt) "X25: " fmt
+
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
@@ -89,7 +91,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
 */
 
        if (frametype != X25_CLEAR_CONFIRMATION)
-               printk(KERN_DEBUG "x25_receive_data(): unknown frame type %2x\n",frametype);
+               pr_debug("x25_receive_data(): unknown frame type %2x\n",frametype);
 
        return 0;
 }
@@ -114,7 +116,7 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev,
         */
        nb = x25_get_neigh(dev);
        if (!nb) {
-               printk(KERN_DEBUG "X.25: unknown neighbour - %s\n", dev->name);
+               pr_debug("unknown neighbour - %s\n", dev->name);
                goto drop;
        }
 
@@ -154,7 +156,7 @@ void x25_establish_link(struct x25_neigh *nb)
        switch (nb->dev->type) {
        case ARPHRD_X25:
                if ((skb = alloc_skb(1, GFP_ATOMIC)) == NULL) {
-                       printk(KERN_ERR "x25_dev: out of memory\n");
+                       pr_err("x25_dev: out of memory\n");
                        return;
                }
                ptr  = skb_put(skb, 1);
@@ -189,7 +191,7 @@ void x25_terminate_link(struct x25_neigh *nb)
 
        skb = alloc_skb(1, GFP_ATOMIC);
        if (!skb) {
-               printk(KERN_ERR "x25_dev: out of memory\n");
+               pr_err("x25_dev: out of memory\n");
                return;
        }