net/atm/atm_misc.c: checkpatch cleanups

[safe/jmp/linux-2.6] / net / atm / pppoatm.c

diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 0af84cd..62db6d7 100644 (file)
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -33,6 +33,8 @@
  * These hooks are not yet available in ppp_generic
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
@@ -132,7 +134,7 @@ static void pppoatm_unassign_vcc(struct atm_vcc *atmvcc)
 static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
 {
        struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
-       pr_debug("pppoatm push\n");
+       pr_debug("\n");
        if (skb == NULL) {                      /* VCC was closed */
                pr_debug("removing ATMPPP VCC %p\n", pvcc);
                pppoatm_unassign_vcc(atmvcc);
@@ -165,10 +167,9 @@ static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
                        pvcc->chan.mtu += LLC_LEN;
                        break;
                }
-               pr_debug("Couldn't autodetect yet "
-                   "(skb: %02X %02X %02X %02X %02X %02X)\n",
-                   skb->data[0], skb->data[1], skb->data[2],
-                   skb->data[3], skb->data[4], skb->data[5]);
+               pr_debug("Couldn't autodetect yet (skb: %02X %02X %02X %02X %02X %02X)\n",
+                        skb->data[0], skb->data[1], skb->data[2],
+                        skb->data[3], skb->data[4], skb->data[5]);
                goto error;
        case e_vc:
                break;
@@ -194,7 +195,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
 {
        struct pppoatm_vcc *pvcc = chan_to_pvcc(chan);
        ATM_SKB(skb)->vcc = pvcc->atmvcc;
-       pr_debug("pppoatm_send (skb=0x%p, vcc=0x%p)\n", skb, pvcc->atmvcc);
+       pr_debug("(skb=0x%p, vcc=0x%p)\n", skb, pvcc->atmvcc);
        if (skb->data[0] == '\0' && (pvcc->flags & SC_COMP_PROT))
                (void) skb_pull(skb, 1);
        switch (pvcc->encaps) {         /* LLC encapsulation needed */
@@ -226,8 +227,8 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
 
        atomic_add(skb->truesize, &sk_atm(ATM_SKB(skb)->vcc)->sk_wmem_alloc);
        ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options;
-       pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, ATM_SKB(skb)->vcc,
-           ATM_SKB(skb)->vcc->dev);
+       pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n",
+                skb, ATM_SKB(skb)->vcc, ATM_SKB(skb)->vcc->dev);
        return ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb)
            ? DROP_PACKET : 1;
     nospace: