ata: Convert ata_<foo>_printk(KERN_<LEVEL> to ata_<foo>_<level>

Saves text by removing nearly duplicated text format strings by
creating ata_<foo>_printk functions and printf extension %pV.

ata defconfig size shrinks ~5% (~8KB), allyesconfig ~2.5% (~13KB)

Format string duplication comes from:

 #define ata_link_printk(link, lv, fmt, args...) do { \
       if (sata_pmp_attached((link)->ap) || (link)->ap->slave_link)    \
               printk("%sata%u.%02u: "fmt, lv, (link)->ap->print_id,   \
                      (link)->pmp , ##args); \
       else \
               printk("%sata%u: "fmt, lv, (link)->ap->print_id , ##args); \
       } while(0)

Coalesce long formats.

$ size drivers/ata/built-in.*
   text	   data	    bss	    dec	    hex	filename
 544969	  73893	 116584	 735446	  b38d6	drivers/ata/built-in.allyesconfig.ata.o
 558429	  73893	 117864	 750186	  b726a	drivers/ata/built-in.allyesconfig.dev_level.o
 141328	  14689	   4220	 160237	  271ed	drivers/ata/built-in.defconfig.ata.o
 149567	  14689	   4220	 168476	  2921c	drivers/ata/built-in.defconfig.dev_level.o

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 39761f50a3e2..c102d7d64282 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -286,10 +286,10 @@ static ssize_t ahci_read_em_buffer(struct device *dev,
         /* the count should not be larger than PAGE_SIZE */
         if (count > PAGE_SIZE) {
                 if (printk_ratelimit())
-                        ata_port_printk(ap, KERN_WARNING,
-                                        "EM read buffer size too large: "
-                                        "buffer size %u, page size %lu\n",
-                                        hpriv->em_buf_sz, PAGE_SIZE);
+                        ata_port_warn(ap,
+                                      "EM read buffer size too large: "
+                                      "buffer size %u, page size %lu\n",
+                                      hpriv->em_buf_sz, PAGE_SIZE);
                 count = PAGE_SIZE;
         }
 
@@ -1124,8 +1124,8 @@ static void ahci_dev_config(struct ata_device *dev)
 
         if (hpriv->flags & AHCI_HFLAG_SECT255) {
                 dev->max_sectors = 255;
-                ata_dev_printk(dev, KERN_INFO,
-                               "SB600 AHCI: limiting to 255 sectors per cmd\n");
+                ata_dev_info(dev,
+                             "SB600 AHCI: limiting to 255 sectors per cmd\n");
         }
 }
 
@@ -1249,8 +1249,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
         /* prepare for SRST (AHCI-1.1 10.4.1) */
         rc = ahci_kick_engine(ap);
         if (rc && rc != -EOPNOTSUPP)
-                ata_link_printk(link, KERN_WARNING,
-                                "failed to reset engine (errno=%d)\n", rc);
+                ata_link_warn(link, "failed to reset engine (errno=%d)\n", rc);
 
         ata_tf_init(link->device, &tf);
 
@@ -1283,8 +1282,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
                  * be trusted.  Treat device readiness timeout as link
                  * offline.
                  */
-                ata_link_printk(link, KERN_INFO,
-                                "device not ready, treating as offline\n");
+                ata_link_info(link, "device not ready, treating as offline\n");
                 *class = ATA_DEV_NONE;
         } else if (rc) {
                 /* link occupied, -ENODEV too is an error */
@@ -1297,7 +1295,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
         return 0;
 
  fail:
-        ata_link_printk(link, KERN_ERR, "softreset failed (%s)\n", reason);
+        ata_link_err(link, "softreset failed (%s)\n", reason);
         return rc;
 }
 
@@ -1966,7 +1964,7 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)
         if (rc == 0)
                 ahci_power_down(ap);
         else {
-                ata_port_printk(ap, KERN_ERR, "%s (%d)\n", emsg, rc);
+                ata_port_err(ap, "%s (%d)\n", emsg, rc);
                 ahci_start_port(ap);
         }
 
@@ -2061,7 +2059,7 @@ static void ahci_port_stop(struct ata_port *ap)
         /* de-initialize port */
         rc = ahci_deinit_port(ap, &emsg);
         if (rc)
-                ata_port_printk(ap, KERN_WARNING, "%s (%d)\n", emsg, rc);
+                ata_port_warn(ap, "%s (%d)\n", emsg, rc);
 }
 
 void ahci_print_info(struct ata_host *host, const char *scc_s)