net: Convert printks to pr_<level>

Use a more current kernel messaging style.

Convert a printk block to print_hex_dump.
Coalesce formats, align arguments.
Use %s, __func__ instead of embedding function names.

Some messages that were prefixed with <foo>_close are
now prefixed with <foo>_fini.  Some ah4 and esp messages
are now not prefixed with "ip ".

The intent of this patch is to later add something like
  #define pr_fmt(fmt) "IPv4: " fmt.
to standardize the output messages.

Text size is trivially reduced. (x86-32 allyesconfig)

$ size net/ipv4/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 887888	  31558	 249696	1169142	 11d6f6	net/ipv4/built-in.o.new
 887934	  31558	 249800	1169292	 11d78c	net/ipv4/built-in.o.old

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

1 files changed, 8 insertions, 6 deletions

diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c
index 9247d9d70e9d..5b48f49df0ba 100644
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
@@ -75,18 +75,18 @@ static struct xfrm_tunnel xfrm64_tunnel_handler __read_mostly = {
 static int __init ipip_init(void)
 {
         if (xfrm_register_type(&ipip_type, AF_INET) < 0) {
-                printk(KERN_INFO "ipip init: can't add xfrm type\n");
+                pr_info("%s: can't add xfrm type\n", __func__);
                 return -EAGAIN;
         }
 
         if (xfrm4_tunnel_register(&xfrm_tunnel_handler, AF_INET)) {
-                printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET\n");
+                pr_info("%s: can't add xfrm handler for AF_INET\n", __func__);
                 xfrm_unregister_type(&ipip_type, AF_INET);
                 return -EAGAIN;
         }
 #if IS_ENABLED(CONFIG_IPV6)
         if (xfrm4_tunnel_register(&xfrm64_tunnel_handler, AF_INET6)) {
-                printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET6\n");
+                pr_info("%s: can't add xfrm handler for AF_INET6\n", __func__);
                 xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET);
                 xfrm_unregister_type(&ipip_type, AF_INET);
                 return -EAGAIN;
@@ -99,12 +99,14 @@ static void __exit ipip_fini(void)
 {
 #if IS_ENABLED(CONFIG_IPV6)
         if (xfrm4_tunnel_deregister(&xfrm64_tunnel_handler, AF_INET6))
-                printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET6\n");
+                pr_info("%s: can't remove xfrm handler for AF_INET6\n",
+                        __func__);
 #endif
         if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET))
-                printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET\n");
+                pr_info("%s: can't remove xfrm handler for AF_INET\n",
+                        __func__);
         if (xfrm_unregister_type(&ipip_type, AF_INET) < 0)
-                printk(KERN_INFO "ipip close: can't remove xfrm type\n");
+                pr_info("%s: can't remove xfrm type\n", __func__);
 }
 
 module_init(ipip_init);