net: l2tp: Standardize logging styles

Use more current logging styles.

Add pr_fmt to prefix output appropriately.
Convert printks to pr_<level>.
Convert PRINTK macros to new l2tp_<level> macros.
Neaten some <foo>_refcount debugging macros.
Use print_hex_dump_bytes instead of hand-coded loops.
Coalesce formats and align arguments.

Some KERN_DEBUG output is not now emitted unless
dynamic_debugging is enabled.

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

1 files changed, 5 insertions, 10 deletions

diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 88f0abe35443..0291d8d85f30 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -9,6 +9,8 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/icmp.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
@@ -133,7 +135,6 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
         struct l2tp_session *session;
         struct l2tp_tunnel *tunnel = NULL;
         int length;
-        int offset;
 
         /* Point to L2TP header */
         optr = ptr = skb->data;
@@ -168,14 +169,8 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
                 if (!pskb_may_pull(skb, length))
                         goto discard;
 
-                printk(KERN_DEBUG "%s: ip recv: ", tunnel->name);
-
-                offset = 0;
-                do {
-                        printk(" %02X", ptr[offset]);
-                } while (++offset < length);
-
-                printk("\n");
+                pr_debug("%s: ip recv\n", tunnel->name);
+                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, ptr, length);
         }
 
         l2tp_recv_common(session, skb, ptr, optr, 0, skb->len,
@@ -752,7 +747,7 @@ static int __init l2tp_ip6_init(void)
 {
         int err;
 
-        printk(KERN_INFO "L2TP IP encapsulation support for IPv6 (L2TPv3)\n");
+        pr_info("L2TP IP encapsulation support for IPv6 (L2TPv3)\n");
 
         err = proto_register(&l2tp_ip6_prot, 1);
         if (err != 0)