drivers/net/mlx4: Use %pV, pr_<level>, printk_once

Remove near duplication of format string constants by using the newly
introduced vsprintf extention %pV to reduce text by 20k or so.

$ size drivers/net/mlx4/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 161367	   1866	  48784	 212017	  33c31	drivers/net/mlx4/built-in.o
 142621	   1866	  46248	 190735	  2e90f	drivers/net/mlx4/built-in.o.new

Use printk_once as appropriate.
Convert printks to pr_<level>, some bare printks now use pr_cont.
Remove now unused #define PFX.

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

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index e3e0d54a7c87..5102ab1ac561 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1050,8 +1050,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         int err;
         int port;
 
-        printk(KERN_INFO PFX "Initializing %s\n",
-               pci_name(pdev));
+        pr_info(DRV_NAME ": Initializing %s\n", pci_name(pdev));
 
         err = pci_enable_device(pdev);
         if (err) {
@@ -1216,12 +1215,7 @@ err_disable_pdev:
 static int __devinit mlx4_init_one(struct pci_dev *pdev,
                                    const struct pci_device_id *id)
 {
-        static int mlx4_version_printed;
-
-        if (!mlx4_version_printed) {
-                printk(KERN_INFO "%s", mlx4_version);
-                ++mlx4_version_printed;
-        }
+        printk_once(KERN_INFO "%s", mlx4_version);
 
         return __mlx4_init_one(pdev, id);
 }
@@ -1301,17 +1295,17 @@ static struct pci_driver mlx4_driver = {
 static int __init mlx4_verify_params(void)
 {
         if ((log_num_mac < 0) || (log_num_mac > 7)) {
-                printk(KERN_WARNING "mlx4_core: bad num_mac: %d\n", log_num_mac);
+                pr_warning("mlx4_core: bad num_mac: %d\n", log_num_mac);
                 return -1;
         }
 
         if ((log_num_vlan < 0) || (log_num_vlan > 7)) {
-                printk(KERN_WARNING "mlx4_core: bad num_vlan: %d\n", log_num_vlan);
+                pr_warning("mlx4_core: bad num_vlan: %d\n", log_num_vlan);
                 return -1;
         }
 
         if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 5)) {
-                printk(KERN_WARNING "mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
+                pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
                 return -1;
         }