lapb: Neaten debugging

Enable dynamic debugging and remove a bunch of #ifdef/#endifs.

Add a lapb_dbg(level, fmt, ...) macro and replace the
printk(KERN_DEBUG uses.
Add pr_fmt and remove embedded prefixes.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 25 deletions

diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c
index baab2760f651..ba4d015bd1a6 100644
--- a/net/lapb/lapb_out.c
+++ b/net/lapb/lapb_out.c
@@ -14,6 +14,8 @@
  *      LAPB 002        Jonathan Naylor New timer architecture.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -60,10 +62,8 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll
                 *frame |= lapb->vs << 1;
         }
 
-#if LAPB_DEBUG > 1
-        printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n",
-               lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr);
-#endif
+        lapb_dbg(1, "(%p) S%d TX I(%d) S%d R%d\n",
+                 lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr);
 
         lapb_transmit_buffer(lapb, skb, LAPB_COMMAND);
 }
@@ -148,11 +148,9 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type)
                 }
         }
 
-#if LAPB_DEBUG > 2
-        printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n",
-               lapb->dev, lapb->state,
-               skb->data[0], skb->data[1], skb->data[2]);
-#endif
+        lapb_dbg(2, "(%p) S%d TX %02X %02X %02X\n",
+                 lapb->dev, lapb->state,
+                 skb->data[0], skb->data[1], skb->data[2]);
 
         if (!lapb_data_transmit(lapb, skb))
                 kfree_skb(skb);
@@ -164,16 +162,10 @@ void lapb_establish_data_link(struct lapb_cb *lapb)
         lapb->n2count   = 0;
 
         if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n",
-                       lapb->dev, lapb->state);
-#endif
+                lapb_dbg(1, "(%p) S%d TX SABME(1)\n", lapb->dev, lapb->state);
                 lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
         } else {
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n",
-                       lapb->dev, lapb->state);
-#endif
+                lapb_dbg(1, "(%p) S%d TX SABM(1)\n", lapb->dev, lapb->state);
                 lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
         }
 
@@ -183,10 +175,8 @@ void lapb_establish_data_link(struct lapb_cb *lapb)
 
 void lapb_enquiry_response(struct lapb_cb *lapb)
 {
-#if LAPB_DEBUG > 1
-        printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n",
-               lapb->dev, lapb->state, lapb->vr);
-#endif
+        lapb_dbg(1, "(%p) S%d TX RR(1) R%d\n",
+                 lapb->dev, lapb->state, lapb->vr);
 
         lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE);
 
@@ -195,10 +185,8 @@ void lapb_enquiry_response(struct lapb_cb *lapb)
 
 void lapb_timeout_response(struct lapb_cb *lapb)
 {
-#if LAPB_DEBUG > 1
-        printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n",
-               lapb->dev, lapb->state, lapb->vr);
-#endif
+        lapb_dbg(1, "(%p) S%d TX RR(0) R%d\n",
+                 lapb->dev, lapb->state, lapb->vr);
         lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE);
 
         lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;