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>

25 files changed, 163 insertions, 181 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index e588a34e85c2..b7a946611f2f 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1085,13 +1085,11 @@ out:
         return;
 
 out_permanent:
-        printk(KERN_ERR "Attempt to override permanent protocol %d.\n",
-               protocol);
+        pr_err("Attempt to override permanent protocol %d\n", protocol);
         goto out;
 
 out_illegal:
-        printk(KERN_ERR
-               "Ignoring attempt to register invalid socket type %d.\n",
+        pr_err("Ignoring attempt to register invalid socket type %d\n",
                p->type);
         goto out;
 }
@@ -1100,8 +1098,7 @@ EXPORT_SYMBOL(inet_register_protosw);
 void inet_unregister_protosw(struct inet_protosw *p)
 {
         if (INET_PROTOSW_PERMANENT & p->flags) {
-                printk(KERN_ERR
-                       "Attempt to unregister permanent protocol %d.\n",
+                pr_err("Attempt to unregister permanent protocol %d\n",
                        p->protocol);
         } else {
                 spin_lock_bh(&inetsw_lock);
@@ -1150,8 +1147,8 @@ static int inet_sk_reselect_saddr(struct sock *sk)
                 return 0;
 
         if (sysctl_ip_dynaddr > 1) {
-                printk(KERN_INFO "%s(): shifting inet->saddr from %pI4 to %pI4\n",
-                       __func__, &old_saddr, &new_saddr);
+                pr_info("%s(): shifting inet->saddr from %pI4 to %pI4\n",
+                        __func__, &old_saddr, &new_saddr);
         }
 
         inet->inet_saddr = inet->inet_rcv_saddr = new_saddr;
@@ -1680,14 +1677,14 @@ static int __init inet_init(void)
          */
 
         if (inet_add_protocol(&icmp_protocol, IPPROTO_ICMP) < 0)
-                printk(KERN_CRIT "inet_init: Cannot add ICMP protocol\n");
+                pr_crit("%s: Cannot add ICMP protocol\n", __func__);
         if (inet_add_protocol(&udp_protocol, IPPROTO_UDP) < 0)
-                printk(KERN_CRIT "inet_init: Cannot add UDP protocol\n");
+                pr_crit("%s: Cannot add UDP protocol\n", __func__);
         if (inet_add_protocol(&tcp_protocol, IPPROTO_TCP) < 0)
-                printk(KERN_CRIT "inet_init: Cannot add TCP protocol\n");
+                pr_crit("%s: Cannot add TCP protocol\n", __func__);
 #ifdef CONFIG_IP_MULTICAST
         if (inet_add_protocol(&igmp_protocol, IPPROTO_IGMP) < 0)
-                printk(KERN_CRIT "inet_init: Cannot add IGMP protocol\n");
+                pr_crit("%s: Cannot add IGMP protocol\n", __func__);
 #endif
 
         /* Register the socket-side information for inet_create. */
@@ -1734,14 +1731,14 @@ static int __init inet_init(void)
          */
 #if defined(CONFIG_IP_MROUTE)
         if (ip_mr_init())
-                printk(KERN_CRIT "inet_init: Cannot init ipv4 mroute\n");
+                pr_crit("%s: Cannot init ipv4 mroute\n", __func__);
 #endif
         /*
          *      Initialise per-cpu ipv4 mibs
          */
 
         if (init_ipv4_mibs())
-                printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n");
+                pr_crit("%s: Cannot init ipv4 mibs\n", __func__);
 
         ipv4_proc_init();
 
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 36d14406261e..b5524660c81d 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -445,9 +445,9 @@ static int ah_init_state(struct xfrm_state *x)
 
         if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
             crypto_ahash_digestsize(ahash)) {
-                printk(KERN_INFO "AH: %s digestsize %u != %hu\n",
-                       x->aalg->alg_name, crypto_ahash_digestsize(ahash),
-                       aalg_desc->uinfo.auth.icv_fullbits/8);
+                pr_info("AH: %s digestsize %u != %hu\n",
+                        x->aalg->alg_name, crypto_ahash_digestsize(ahash),
+                        aalg_desc->uinfo.auth.icv_fullbits/8);
                 goto error;
         }
 
@@ -510,11 +510,11 @@ static const struct net_protocol ah4_protocol = {
 static int __init ah4_init(void)
 {
         if (xfrm_register_type(&ah_type, AF_INET) < 0) {
-                printk(KERN_INFO "ip ah init: can't add xfrm type\n");
+                pr_info("%s: can't add xfrm type\n", __func__);
                 return -EAGAIN;
         }
         if (inet_add_protocol(&ah4_protocol, IPPROTO_AH) < 0) {
-                printk(KERN_INFO "ip ah init: can't add protocol\n");
+                pr_info("%s: can't add protocol\n", __func__);
                 xfrm_unregister_type(&ah_type, AF_INET);
                 return -EAGAIN;
         }
@@ -524,9 +524,9 @@ static int __init ah4_init(void)
 static void __exit ah4_fini(void)
 {
         if (inet_del_protocol(&ah4_protocol, IPPROTO_AH) < 0)
-                printk(KERN_INFO "ip ah close: can't remove protocol\n");
+                pr_info("%s: can't remove protocol\n", __func__);
         if (xfrm_unregister_type(&ah_type, AF_INET) < 0)
-                printk(KERN_INFO "ip ah close: can't remove xfrm type\n");
+                pr_info("%s: can't remove xfrm type\n", __func__);
 }
 
 module_init(ah4_init);
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index a5b413416da3..0a86dbe9454b 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -706,11 +706,11 @@ static const struct net_protocol esp4_protocol = {
 static int __init esp4_init(void)
 {
         if (xfrm_register_type(&esp_type, AF_INET) < 0) {
-                printk(KERN_INFO "ip esp init: can't add xfrm type\n");
+                pr_info("%s: can't add xfrm type\n", __func__);
                 return -EAGAIN;
         }
         if (inet_add_protocol(&esp4_protocol, IPPROTO_ESP) < 0) {