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, 28 insertions, 38 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index a791b8ce6294..e0a5b555cee1 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -332,25 +332,22 @@ int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *gtm)
 
         rc = -EINVAL;
         if (ACPI_FAILURE(status)) {
-                ata_port_printk(ap, KERN_ERR,
-                                "ACPI get timing mode failed (AE 0x%x)\n",
-                                status);
+                ata_port_err(ap, "ACPI get timing mode failed (AE 0x%x)\n",
+                             status);
                 goto out_free;
         }
 
         out_obj = output.pointer;
         if (out_obj->type != ACPI_TYPE_BUFFER) {
-                ata_port_printk(ap, KERN_WARNING,
-                                "_GTM returned unexpected object type 0x%x\n",
-                                out_obj->type);
+                ata_port_warn(ap, "_GTM returned unexpected object type 0x%x\n",
+                              out_obj->type);
 
                 goto out_free;
         }
 
         if (out_obj->buffer.length != sizeof(struct ata_acpi_gtm)) {
-                ata_port_printk(ap, KERN_ERR,
-                                "_GTM returned invalid length %d\n",
-                                out_obj->buffer.length);
+                ata_port_err(ap, "_GTM returned invalid length %d\n",
+                             out_obj->buffer.length);
                 goto out_free;
         }
 
@@ -402,8 +399,8 @@ int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm)
         if (status == AE_NOT_FOUND)
                 return -ENOENT;
         if (ACPI_FAILURE(status)) {
-                ata_port_printk(ap, KERN_ERR,
-                        "ACPI set timing mode failed (status=0x%x)\n", status);
+                ata_port_err(ap, "ACPI set timing mode failed (status=0x%x)\n",
+                             status);
                 return -EINVAL;
         }
         return 0;
@@ -450,8 +447,8 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf)
         output.pointer = NULL;  /* ACPI-CA sets this; save/free it later */
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
-                               __func__, ap->port_no);
+                ata_dev_dbg(dev, "%s: ENTER: port#: %d\n",
+                            __func__, ap->port_no);
 
         /* _GTF has no input parameters */
         status = acpi_evaluate_object(dev->acpi_handle, "_GTF", NULL, &output);
@@ -459,9 +456,8 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf)
 
         if (ACPI_FAILURE(status)) {
                 if (status != AE_NOT_FOUND) {
-                        ata_dev_printk(dev, KERN_WARNING,
-                                       "_GTF evaluation failed (AE 0x%x)\n",
-                                       status);
+                        ata_dev_warn(dev, "_GTF evaluation failed (AE 0x%x)\n",
+                                     status);
                         rc = -EINVAL;
                 }
                 goto out_free;
@@ -469,27 +465,24 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf)
 
         if (!output.length || !output.pointer) {
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(dev, KERN_DEBUG, "%s: Run _GTF: "
-                                "length or ptr is NULL (0x%llx, 0x%p)\n",
-                                __func__,
-                                (unsigned long long)output.length,
-                                output.pointer);
+                        ata_dev_dbg(dev, "%s: Run _GTF: length or ptr is NULL (0x%llx, 0x%p)\n",
+                                    __func__,
+                                    (unsigned long long)output.length,
+                                    output.pointer);
                 rc = -EINVAL;
                 goto out_free;
         }
 
         if (out_obj->type != ACPI_TYPE_BUFFER) {
-                ata_dev_printk(dev, KERN_WARNING,
-                               "_GTF unexpected object type 0x%x\n",
-                               out_obj->type);
+                ata_dev_warn(dev, "_GTF unexpected object type 0x%x\n",
+                             out_obj->type);
                 rc = -EINVAL;
                 goto out_free;
         }
 
         if (out_obj->buffer.length % REGS_PER_GTF) {
-                ata_dev_printk(dev, KERN_WARNING,
-                               "unexpected _GTF length (%d)\n",
-                               out_obj->buffer.length);
+                ata_dev_warn(dev, "unexpected _GTF length (%d)\n",
+                             out_obj->buffer.length);
                 rc = -EINVAL;
                 goto out_free;
         }
@@ -499,9 +492,8 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf)
         if (gtf) {
                 *gtf = (void *)out_obj->buffer.pointer;
                 if (ata_msg_probe(ap))
-                        ata_dev_printk(dev, KERN_DEBUG,
-                                       "%s: returning gtf=%p, gtf_count=%d\n",
-                                       __func__, *gtf, rc);
+                        ata_dev_dbg(dev, "%s: returning gtf=%p, gtf_count=%d\n",
+                                    __func__, *gtf, rc);
         }
         return rc;
 
@@ -811,8 +803,8 @@ static int ata_acpi_push_id(struct ata_device *dev)
         union acpi_object in_params[1];
 
         if (ata_msg_probe(ap))
-                ata_dev_printk(dev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",
-                               __func__, dev->devno, ap->port_no);
+                ata_dev_dbg(dev, "%s: ix = %d, port#: %d\n",
+                            __func__, dev->devno, ap->port_no);
 
         /* Give the drive Identify data to the drive via the _SDD method */
         /* _SDD: set up input parameters */
@@ -832,8 +824,7 @@ static int ata_acpi_push_id(struct ata_device *dev)
                 return -ENOENT;
 
         if (ACPI_FAILURE(status)) {
-                ata_dev_printk(dev, KERN_WARNING,
-                               "ACPI _SDD failed (AE 0x%x)\n", status);
+                ata_dev_warn(dev, "ACPI _SDD failed (AE 0x%x)\n", status);
                 return -EIO;
         }
 
@@ -983,8 +974,8 @@ int ata_acpi_on_devcfg(struct ata_device *dev)
         if (nr_executed) {
                 rc = ata_dev_reread_id(dev, 0);
                 if (rc < 0) {
-                        ata_dev_printk(dev, KERN_ERR, "failed to IDENTIFY "
-                                       "after ACPI commands\n");
+                        ata_dev_err(dev,
+                                    "failed to IDENTIFY after ACPI commands\n");
                         return rc;
                 }
         }
@@ -1002,8 +993,7 @@ int ata_acpi_on_devcfg(struct ata_device *dev)
                 return rc;
         }
 
-        ata_dev_printk(dev, KERN_WARNING,
-                       "ACPI: failed the second time, disabled\n");
+        ata_dev_warn(dev, "ACPI: failed the second time, disabled\n");
         dev->acpi_handle = NULL;
 
         /* We can safely continue if no _GTF command has been executed