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, 19 insertions, 22 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index bea717a22e32..b0e45d29244f 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1190,7 +1190,7 @@ static void mv_wait_for_edma_empty_idle(struct ata_port *ap)
                         break;
                 udelay(per_loop);
         }
-        /* ata_port_printk(ap, KERN_INFO, "%s: %u+ usecs\n", __func__, i); */
+        /* ata_port_info(ap, "%s: %u+ usecs\n", __func__, i); */
 }
 
 /**
@@ -1228,7 +1228,7 @@ static int mv_stop_edma(struct ata_port *ap)
         pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN;
         mv_wait_for_edma_empty_idle(ap);
         if (mv_stop_edma_engine(port_mmio)) {
-                ata_port_printk(ap, KERN_ERR, "Unable to stop eDMA\n");
+                ata_port_err(ap, "Unable to stop eDMA\n");
                 err = -EIO;
         }
         mv_edma_cfg(ap, 0, 0);
@@ -1382,7 +1382,7 @@ static void mv6_dev_config(struct ata_device *adev)
         if (adev->flags & ATA_DFLAG_NCQ) {
                 if (sata_pmp_attached(adev->link->ap)) {
                         adev->flags &= ~ATA_DFLAG_NCQ;
-                        ata_dev_printk(adev, KERN_INFO,
+                        ata_dev_info(adev,
                                 "NCQ disabled for command-based switching\n");
                 }
         }
@@ -2225,9 +2225,8 @@ static unsigned int mv_send_fis(struct ata_port *ap, u32 *fis, int nwords)
 
         /* See if it worked */
         if ((ifstat & 0x3000) != 0x1000) {
-                ata_port_printk(ap, KERN_WARNING,
-                                "%s transmission error, ifstat=%08x\n",
-                                __func__, ifstat);
+                ata_port_warn(ap, "%s transmission error, ifstat=%08x\n",
+                              __func__, ifstat);
                 return AC_ERR_OTHER;
         }
         return 0;
@@ -2342,9 +2341,9 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc)
                  */
                 if (limit_warnings > 0 && (qc->nbytes / qc->sect_size) > 1) {
                         --limit_warnings;
-                        ata_link_printk(qc->dev->link, KERN_WARNING, DRV_NAME
-                                        ": attempting PIO w/multiple DRQ: "
-                                        "this may fail due to h/w errata\n");
+                        ata_link_warn(qc->dev->link, DRV_NAME
+                                      ": attempting PIO w/multiple DRQ: "
+                                      "this may fail due to h/w errata\n");
                 }
                 /* drop through */
         case ATA_PROT_NODATA:
@@ -2499,20 +2498,20 @@ static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap)
         }
         failed_links = hweight16(new_map);
 
-        ata_port_printk(ap, KERN_INFO, "%s: pmp_map=%04x qc_map=%04x "
-                        "failed_links=%d nr_active_links=%d\n",
-                        __func__, pp->delayed_eh_pmp_map,
-                        ap->qc_active, failed_links,
-                        ap->nr_active_links);
+        ata_port_info(ap,
+                      "%s: pmp_map=%04x qc_map=%04x failed_links=%d nr_active_links=%d\n",
+                      __func__, pp->delayed_eh_pmp_map,
+                      ap->qc_active, failed_links,
+                      ap->nr_active_links);
 
         if (ap->nr_active_links <= failed_links && mv_req_q_empty(ap)) {
                 mv_process_crpb_entries(ap, pp);
                 mv_stop_edma(ap);
                 mv_eh_freeze(ap);
-                ata_port_printk(ap, KERN_INFO, "%s: done\n", __func__);
+                ata_port_info(ap, "%s: done\n", __func__);
                 return 1;       /* handled */
         }
-        ata_port_printk(ap, KERN_INFO, "%s: waiting\n", __func__);
+        ata_port_info(ap, "%s: waiting\n", __func__);
         return 1;       /* handled */
 }
 
@@ -2554,9 +2553,8 @@ static int mv_handle_dev_err(struct ata_port *ap, u32 edma_err_cause)
                  * and we cannot handle it here.
                  */
                 if (edma_err_cause & EDMA_ERR_SELF_DIS) {
-                        ata_port_printk(ap, KERN_WARNING,
-                                "%s: err_cause=0x%x pp_flags=0x%x\n",
-                                __func__, edma_err_cause, pp->pp_flags);
+                        ata_port_warn(ap, "%s: err_cause=0x%x pp_flags=0x%x\n",
+                                      __func__, edma_err_cause, pp->pp_flags);
                         return 0; /* not handled */
                 }
                 return mv_handle_fbs_ncq_dev_err(ap);
@@ -2567,9 +2565,8 @@ static int mv_handle_dev_err(struct ata_port *ap, u32 edma_err_cause)
                  * and we cannot handle it here.
                  */
                 if (!(edma_err_cause & EDMA_ERR_SELF_DIS)) {
-                        ata_port_printk(ap, KERN_WARNING,
-                                "%s: err_cause=0x%x pp_flags=0x%x\n",
-                                __func__, edma_err_cause, pp->pp_flags);
+                        ata_port_warn(ap, "%s: err_cause=0x%x pp_flags=0x%x\n",
+                                      __func__, edma_err_cause, pp->pp_flags);
                         return 0; /* not handled */
                 }
                 return mv_handle_fbs_non_ncq_dev_err(ap);