Linux 3.14

[~andy/linux] / net / lapb / lapb_subr.c

diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c
index 066225b4e82448a24dc0103c0163bc113a75b219..9d0a426eccbb0296f5b25f12c7ddf4d79820f37f 100644 (file)
--- a/net/lapb/lapb_subr.c
+++ b/net/lapb/lapb_subr.c
@@ -13,6 +13,8 @@
  *     LAPB 001        Jonathan Naylor Started Coding
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -111,11 +113,9 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
 {
        frame->type = LAPB_ILLEGAL;
 
-#if LAPB_DEBUG > 2
-       printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n",
-              lapb->dev, lapb->state,
-              skb->data[0], skb->data[1], skb->data[2]);
-#endif
+       lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n",
+                lapb->dev, lapb->state,
+                skb->data[0], skb->data[1], skb->data[2]);
 
        /* We always need to look at 2 bytes, sometimes we need
         * to look at 3 and those cases are handled below.
@@ -284,12 +284,10 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
                dptr++;
                *dptr++ = lapb->frmr_type;
 
-#if LAPB_DEBUG > 1
-       printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
-              lapb->dev, lapb->state,
-              skb->data[1], skb->data[2], skb->data[3],
-              skb->data[4], skb->data[5]);
-#endif
+               lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
+                        lapb->dev, lapb->state,
+                        skb->data[1], skb->data[2], skb->data[3],
+                        skb->data[4], skb->data[5]);
        } else {
                dptr    = skb_put(skb, 4);
                *dptr++ = LAPB_FRMR;
@@ -301,11 +299,9 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
                dptr++;
                *dptr++ = lapb->frmr_type;
 
-#if LAPB_DEBUG > 1
-       printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n",
-              lapb->dev, lapb->state, skb->data[1],
-              skb->data[2], skb->data[3]);
-#endif
+               lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n",
+                        lapb->dev, lapb->state, skb->data[1],
+                        skb->data[2], skb->data[3]);
        }
 
        lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE);