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, 55 insertions, 55 deletions

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 6e412a60a91f..92ac7e7363a0 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -214,7 +214,7 @@ static int __init ic_open_devs(void)
                 if (!(dev->flags & IFF_LOOPBACK))
                         continue;
                 if (dev_change_flags(dev, dev->flags | IFF_UP) < 0)
-                        printk(KERN_ERR "IP-Config: Failed to open %s\n", dev->name);
+                        pr_err("IP-Config: Failed to open %s\n", dev->name);
         }
 
         for_each_netdev(&init_net, dev) {
@@ -223,7 +223,8 @@ static int __init ic_open_devs(void)
                         if (dev->mtu >= 364)
                                 able |= IC_BOOTP;
                         else
-                                printk(KERN_WARNING "DHCP/BOOTP: Ignoring device %s, MTU %d too small", dev->name, dev->mtu);
+                                pr_warn("DHCP/BOOTP: Ignoring device %s, MTU %d too small",
+                                        dev->name, dev->mtu);
                         if (!(dev->flags & IFF_NOARP))
                                 able |= IC_RARP;
                         able &= ic_proto_enabled;
@@ -231,7 +232,8 @@ static int __init ic_open_devs(void)
                                 continue;
                         oflags = dev->flags;
                         if (dev_change_flags(dev, oflags | IFF_UP) < 0) {
-                                printk(KERN_ERR "IP-Config: Failed to open %s\n", dev->name);
+                                pr_err("IP-Config: Failed to open %s\n",
+                                       dev->name);
                                 continue;
                         }
                         if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) {
@@ -273,9 +275,10 @@ have_carrier:
 
         if (!ic_first_dev) {
                 if (user_dev_name[0])
-                        printk(KERN_ERR "IP-Config: Device `%s' not found.\n", user_dev_name);
+                        pr_err("IP-Config: Device `%s' not found\n",
+                               user_dev_name);
                 else
-                        printk(KERN_ERR "IP-Config: No network devices available.\n");
+                        pr_err("IP-Config: No network devices available\n");
                 return -ENODEV;
         }
         return 0;
@@ -359,17 +362,20 @@ static int __init ic_setup_if(void)
         strcpy(ir.ifr_ifrn.ifrn_name, ic_dev->name);
         set_sockaddr(sin, ic_myaddr, 0);
         if ((err = ic_devinet_ioctl(SIOCSIFADDR, &ir)) < 0) {
-                printk(KERN_ERR "IP-Config: Unable to set interface address (%d).\n", err);
+                pr_err("IP-Config: Unable to set interface address (%d)\n",
+                       err);
                 return -1;
         }
         set_sockaddr(sin, ic_netmask, 0);
         if ((err = ic_devinet_ioctl(SIOCSIFNETMASK, &ir)) < 0) {
-                printk(KERN_ERR "IP-Config: Unable to set interface netmask (%d).\n", err);
+                pr_err("IP-Config: Unable to set interface netmask (%d)\n",
+                       err);
                 return -1;
         }
         set_sockaddr(sin, ic_myaddr | ~ic_netmask, 0);
         if ((err = ic_devinet_ioctl(SIOCSIFBRDADDR, &ir)) < 0) {
-                printk(KERN_ERR "IP-Config: Unable to set interface broadcast address (%d).\n", err);
+                pr_err("IP-Config: Unable to set interface broadcast address (%d)\n",
+                       err);
                 return -1;
         }
         /* Handle the case where we need non-standard MTU on the boot link (a network
@@ -380,8 +386,8 @@ static int __init ic_setup_if(void)
                 strcpy(ir.ifr_name, ic_dev->name);
                 ir.ifr_mtu = ic_dev_mtu;
                 if ((err = ic_dev_ioctl(SIOCSIFMTU, &ir)) < 0)
-                        printk(KERN_ERR "IP-Config: Unable to set interface mtu to %d (%d).\n",
-                                         ic_dev_mtu, err);
+                        pr_err("IP-Config: Unable to set interface mtu to %d (%d)\n",
+                               ic_dev_mtu, err);
         }
         return 0;
 }
@@ -396,7 +402,7 @@ static int __init ic_setup_routes(void)
 
                 memset(&rm, 0, sizeof(rm));
                 if ((ic_gateway ^ ic_myaddr) & ic_netmask) {
-                        printk(KERN_ERR "IP-Config: Gateway not on directly connected network.\n");
+                        pr_err("IP-Config: Gateway not on directly connected network\n");
                         return -1;
                 }
                 set_sockaddr((struct sockaddr_in *) &rm.rt_dst, 0, 0);
@@ -404,7 +410,8 @@ static int __init ic_setup_routes(void)
                 set_sockaddr((struct sockaddr_in *) &rm.rt_gateway, ic_gateway, 0);
                 rm.rt_flags = RTF_UP | RTF_GATEWAY;
                 if ((err = ic_route_ioctl(SIOCADDRT, &rm)) < 0) {
-                        printk(KERN_ERR "IP-Config: Cannot add default route (%d).\n", err);
+                        pr_err("IP-Config: Cannot add default route (%d)\n",
+                               err);
                         return -1;
                 }
         }
@@ -437,8 +444,8 @@ static int __init ic_defaults(void)
                 else if (IN_CLASSC(ntohl(ic_myaddr)))
                         ic_netmask = htonl(IN_CLASSC_NET);
                 else {
-                        printk(KERN_ERR "IP-Config: Unable to guess netmask for address %pI4\n",
-                                &ic_myaddr);
+                        pr_err("IP-Config: Unable to guess netmask for address %pI4\n",
+                               &ic_myaddr);
                         return -1;
                 }
                 printk("IP-Config: Guessing netmask %pI4\n", &ic_netmask);
@@ -688,8 +695,8 @@ ic_dhcp_init_options(u8 *options)
                         e += len;
                 }
                 if (*vendor_class_identifier) {
-                        printk(KERN_INFO "DHCP: sending class identifier \"%s\"\n",
-                               vendor_class_identifier);
+                        pr_info("DHCP: sending class identifier \"%s\"\n",
+                                vendor_class_identifier);
                         *e++ = 60;      /* Class-identifier */
                         len = strlen(vendor_class_identifier);
                         *e++ = len;
@@ -949,8 +956,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
         /* Fragments are not supported */
         if (ip_is_fragment(h)) {
                 if (net_ratelimit())
-                        printk(KERN_ERR "DHCP/BOOTP: Ignoring fragmented "
-                               "reply.\n");
+                        pr_err("DHCP/BOOTP: Ignoring fragmented reply\n");
                 goto drop;
         }
 
@@ -999,8 +1005,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
         if (b->op != BOOTP_REPLY ||
             b->xid != d->xid) {
                 if (net_ratelimit())
-                        printk(KERN_ERR "DHCP/BOOTP: Reply not for us, "
-                               "op[%x] xid[%x]\n",
+                        pr_err("DHCP/BOOTP: Reply not for us, op[%x] xid[%x]\n",
                                b->op, b->xid);
                 goto drop_unlock;
         }
@@ -1008,7 +1013,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
         /* Is it a reply for the device we are configuring? */
         if (b->xid != ic_dev_xid) {
                 if (net_ratelimit())
-                        printk(KERN_ERR "DHCP/BOOTP: Ignoring delayed packet\n");
+                        pr_err("DHCP/BOOTP: Ignoring delayed packet\n");
                 goto drop_unlock;
         }
 
@@ -1146,17 +1151,17 @@ static int __init ic_dynamic(void)
          * are missing, and without DHCP/BOOTP/RARP we are unable to get it.
          */
         if (!ic_proto_enabled) {
-                printk(KERN_ERR "IP-Config: Incomplete network configuration information.\n");
+                pr_err("IP-Config: Incomplete network configuration information\n");
                 return -1;
         }
 
 #ifdef IPCONFIG_BOOTP
         if ((ic_proto_enabled ^ ic_proto_have_if) & IC_BOOTP)
-                printk(KERN_ERR "DHCP/BOOTP: No suitable device found.\n");
+                pr_err("DHCP/BOOTP: No suitable device found\n");
 #endif
 #ifdef IPCONFIG_RARP
         if ((ic_proto_enabled ^ ic_proto_have_if) & IC_RARP)
-                printk(KERN_ERR "RARP: No suitable device found.\n");
+                pr_err("RARP: No suitable device found\n");
 #endif
 
         if (!ic_proto_have_if)
@@ -1183,11 +1188,11 @@ static int __init ic_dynamic(void)
          * [Actually we could now, but the nothing else running note still
          *  applies.. - AC]
          */
-        printk(KERN_NOTICE "Sending %s%s%s requests .",
-               do_bootp
-                ? ((ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP") : "",
-               (do_bootp && do_rarp) ? " and " : "",
-               do_rarp ? "RARP" : "");
+        pr_notice("Sending %s%s%s requests .",
+                  do_bootp
+                  ? ((ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP") : "",
+                  (do_bootp && do_rarp) ? " and " : "",
+                  do_rarp ? "RARP" : "");
 
         start_jiffies = jiffies;
         d = ic_first_dev;
@@ -1216,13 +1221,13 @@ static int __init ic_dynamic(void)
                     (ic_proto_enabled & IC_USE_DHCP) &&
                     ic_dhcp_msgtype != DHCPACK) {
                         ic_got_reply = 0;
-                        printk(KERN_CONT ",");
+                        pr_cont(",");
                         continue;
                 }
 #endif /* IPCONFIG_DHCP */
 
                 if (ic_got_reply) {
-                        printk(KERN_CONT " OK\n");
+                        pr_cont(" OK\n");
                         break;
                 }
 
@@ -1230,7 +1235,7 @@ static int __init ic_dynamic(void)
                         continue;
 
                 if (! --retries) {
-                        printk(KERN_CONT " timed out!\n");
+                        pr_cont(" timed out!\n");
                         break;
                 }
 
@@ -1240,7 +1245,7 @@ static int __init ic_dynamic(void)
                 if (timeout > CONF_TIMEOUT_MAX)
                         timeout = CONF_TIMEOUT_MAX;
 
-                printk(KERN_CONT ".");
+                pr_cont(".");
         }
 
 #ifdef IPCONFIG_BOOTP
@@ -1260,8 +1265,8 @@ static int __init ic_dynamic(void)
         printk("IP-Config: Got %s answer from %pI4, ",
                 ((ic_got_reply & IC_RARP) ? "RARP"
                  : (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"),
-                &ic_servaddr);
-        printk(KERN_CONT "my address is %pI4\n", &ic_myaddr);
+               &ic_servaddr);
+        pr_cont("my address is %pI4\n", &ic_myaddr);
 
         return 0;
 }
@@ -1437,24 +1442,22 @@ static int __init ip_auto_config(void)
                          */
 #ifdef CONFIG_ROOT_NFS
                         if (ROOT_DEV ==  Root_NFS) {
-                                printk(KERN_ERR
-                                        "IP-Config: Retrying forever (NFS root)...\n");
+                                pr_err("IP-Config: Retrying forever (NFS root)...\n");
                                 goto try_try_again;
                         }
 #endif
 
                         if (--retries) {
-                                printk(KERN_ERR
-                                       "IP-Config: Reopening network devices...\n");
+                                pr_err("IP-Config: Reopening network devices...\n");
                                 goto try_try_again;
                         }
 
                         /* Oh, well.  At least we tried. */
-                        printk(KERN_ERR "IP-Config: Auto-configuration of network failed.\n");
+                        pr_err("IP-Config: Auto-configuration of network failed\n");
                         return -1;
                 }
 #else /* !DYNAMIC */
-                printk(KERN_ERR "IP-Config: Incomplete network configuration information.\n");
+                pr_err("IP-Config: Incomplete network configuration information\n");
                 ic_close_devs();
                 return -1;
 #endif /* IPCONFIG_DYNAMIC */
@@ -1492,19 +1495,16 @@ static int __init ip_auto_config(void)
         /*
          * Clue in the operator.
          */
-        printk("IP-Config: Complete:\n");
-        printk("     device=%s", ic_dev->name);
-        printk(KERN_CONT ", addr=%pI4", &ic_myaddr);
-        printk(KERN_CONT ", mask=%pI4", &ic_netmask);
-        printk(KERN_CONT ", gw=%pI4", &ic_gateway);
-        printk(KERN_CONT ",\n     host=%s, domain=%s, nis-domain=%s",
-               utsname()->nodename, ic_domain, utsname()->domainname);
-        printk(KERN_CONT ",\n     bootserver=%pI4", &ic_servaddr);
-        printk(KERN_CONT ", rootserver=%pI4", &root_server_addr);
-        printk(KERN_CONT ", rootpath=%s", root_server_path);
+        pr_info("IP-Config: Complete:\n");
+        pr_info("     device=%s, addr=%pI4, mask=%pI4, gw=%pI4\n",
+                ic_dev->name, &ic_myaddr, &ic_netmask, &ic_gateway);
+        pr_info("     host=%s, domain=%s, nis-domain=%s\n",
+                utsname()->nodename, ic_domain, utsname()->domainname);
+        pr_info("     bootserver=%pI4, rootserver=%pI4, rootpath=%s",
+                &ic_servaddr, &root_server_addr, root_server_path);
         if (ic_dev_mtu)
-                printk(KERN_CONT ", mtu=%d", ic_dev_mtu);
-        printk(KERN_CONT "\n");
+                pr_cont(", mtu=%d", ic_dev_mtu);
+        pr_cont("\n");
 #endif /* !SILENT */
 
         return 0;
@@ -1637,8 +1637,8 @@ static int __init vendor_class_identifier_setup(char *addrs)
         if (strlcpy(vendor_class_identifier, addrs,
                     sizeof(vendor_class_identifier))
             >= sizeof(vendor_class_identifier))
-                printk(KERN_WARNING "DHCP: vendorclass too long, truncated to \"%s\"",
-                       vendor_class_identifier);
+                pr_warn("DHCP: vendorclass too long, truncated to \"%s\"",
+                        vendor_class_identifier);
         return 1;
 }