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, 10 insertions, 13 deletions

diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c
index ae22be4157b5..e52d90ad1fe9 100644
--- a/drivers/ata/acard-ahci.c
+++ b/drivers/ata/acard-ahci.c
@@ -135,8 +135,8 @@ static int acard_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;
         }
 
@@ -187,7 +187,7 @@ static int acard_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,
+                                dev_err(&pdev->dev,
                                            "64-bit DMA enable failed\n");
                                 return rc;
                         }
@@ -195,14 +195,13 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
         } 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;
                 }
         }
@@ -343,14 +342,12 @@ static int acard_ahci_port_start(struct ata_port *ap)
                 if (cmd & PORT_CMD_FBSCP)
                         pp->fbs_supported = true;
                 else if (hpriv->flags & AHCI_HFLAG_YES_FBS) {
-                        dev_printk(KERN_INFO, dev,
-                                   "port %d can do FBS, forcing FBSCP\n",
-                                   ap->port_no);
+                        dev_info(dev, "port %d can do FBS, forcing FBSCP\n",
+                                 ap->port_no);
                         pp->fbs_supported = true;
                 } else
-                        dev_printk(KERN_WARNING, dev,
-                                   "port %d is not capable of FBS\n",
-                                   ap->port_no);
+                        dev_warn(dev, "port %d is not capable of FBS\n",
+                                 ap->port_no);
         }
 
         if (pp->fbs_supported) {