ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

Saves a bit of text as the call takes fewer args.

Coalesce a few formats.
Convert a few bare printks to pr_cont.

$ size drivers/ata/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 558429	  73893	 117864	 750186	  b726a	drivers/ata/built-in.o.allyesconfig.new
 559574	  73893	 117888	 751355	  b76fb	drivers/ata/built-in.o.allyesconfig.old
 149567	  14689	   4220	 168476	  2921c	drivers/ata/built-in.o.defconfig.new
 149851	  14689	   4220	 168760	  29338	drivers/ata/built-in.o.defconfig.old

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

1 files changed, 21 insertions, 23 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 71afe0371311..dda85116343e 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -629,8 +629,8 @@ static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
 
         if (mesg.event & PM_EVENT_SUSPEND &&
             hpriv->flags & AHCI_HFLAG_NO_SUSPEND) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "BIOS update required for suspend/resume\n");
+                dev_err(&pdev->dev,
+                        "BIOS update required for suspend/resume\n");
                 return -EIO;
         }
 
@@ -681,22 +681,21 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
                 if (rc) {
                         rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                         if (rc) {
-                                dev_printk(KERN_ERR, &pdev->dev,
-                                           "64-bit DMA enable failed\n");
+                                dev_err(&pdev->dev,
+                                        "64-bit DMA enable failed\n");
                                 return rc;
                         }
                 }
         } else {
                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
-                        dev_printk(KERN_ERR, &pdev->dev,
-                                   "32-bit DMA enable failed\n");
+                        dev_err(&pdev->dev, "32-bit DMA enable failed\n");
                         return rc;
                 }
                 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
-                        dev_printk(KERN_ERR, &pdev->dev,
-                                   "32-bit consistent DMA enable failed\n");
+                        dev_err(&pdev->dev,
+                                "32-bit consistent DMA enable failed\n");
                         return rc;
                 }
         }
@@ -759,8 +758,8 @@ static void ahci_p5wdh_workaround(struct ata_host *host)
             dmi_check_system(sysids)) {
                 struct ata_port *ap = host->ports[1];
 
-                dev_printk(KERN_INFO, &pdev->dev, "enabling ASUS P5W DH "
-                           "Deluxe on-board SIMG4726 workaround\n");
+                dev_info(&pdev->dev,
+                         "enabling ASUS P5W DH Deluxe on-board SIMG4726 workaround\n");
 
                 ap->ops = &ahci_p5wdh_ops;
                 ap->link.flags |= ATA_LFLAG_NO_SRST | ATA_LFLAG_ASSUME_ATA;
@@ -831,14 +830,14 @@ static bool ahci_sb600_enable_64bit(struct pci_dev *pdev)
         if (strcmp(buf, match->driver_data) >= 0)
                 goto enable_64bit;
         else {
-                dev_printk(KERN_WARNING, &pdev->dev, "%s: BIOS too old, "
-                           "forcing 32bit DMA, update BIOS\n", match->ident);
+                dev_warn(&pdev->dev,
+                         "%s: BIOS too old, forcing 32bit DMA, update BIOS\n",
+                         match->ident);
                 return false;
         }
 
 enable_64bit:
-        dev_printk(KERN_WARNING, &pdev->dev, "%s: enabling 64bit DMA\n",
-                   match->ident);
+        dev_warn(&pdev->dev, "%s: enabling 64bit DMA\n", match->ident);
         return true;
 }
 
@@ -1041,9 +1040,8 @@ static void ahci_gtf_filter_workaround(struct ata_host *host)
                 return;
 
         filter = (unsigned long)dmi->driver_data;
-        dev_printk(KERN_INFO, host->dev,
-                   "applying extra ACPI _GTF filter 0x%x for %s\n",
-                   filter, dmi->ident);
+        dev_info(host->dev, "applying extra ACPI _GTF filter 0x%x for %s\n",
+                 filter, dmi->ident);
 
         for (i = 0; i < host->n_ports; i++) {
                 struct ata_port *ap = host->ports[i];
@@ -1099,8 +1097,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
          * that for SAS drives they're out of luck.
          */
         if (pdev->vendor == PCI_VENDOR_ID_PROMISE)
-                dev_printk(KERN_INFO, &pdev->dev, "PDC42819 "
-                           "can only drive SATA devices with this driver\n");
+                dev_info(&pdev->dev,
+                         "PDC42819 can only drive SATA devices with this driver\n");
 
         /* acquire resources */
         rc = pcim_enable_device(pdev);
@@ -1126,8 +1124,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                  */
                 pci_read_config_byte(pdev, ICH_MAP, &map);
                 if (map & 0x3) {
-                        dev_printk(KERN_INFO, &pdev->dev, "controller is in "
-                                   "combined mode, can't enable AHCI mode\n");
+                        dev_info(&pdev->dev,
+                                 "controller is in combined mode, can't enable AHCI mode\n");
                         return -ENODEV;
                 }
         }
@@ -1184,8 +1182,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         if (ahci_broken_suspend(pdev)) {
                 hpriv->flags |= AHCI_HFLAG_NO_SUSPEND;
-                dev_printk(KERN_WARNING, &pdev->dev,
-                           "BIOS update required for suspend/resume\n");
+                dev_warn(&pdev->dev,
+                         "BIOS update required for suspend/resume\n");
         }
 
         if (ahci_broken_online(pdev)) {