1 files changed, 20 insertions, 19 deletions

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 6f6e7718b05c..9842faac097f 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1225,8 +1225,9 @@ static int piix_pci_device_resume(struct pci_dev *pdev)
                  */
                 rc = pci_reenable_device(pdev);
                 if (rc)
-                        dev_printk(KERN_ERR, &pdev->dev, "failed to enable "
-                                   "device after resume (%d)\n", rc);
+                        dev_err(&pdev->dev,
+                                "failed to enable device after resume (%d)\n",
+                                rc);
         } else
                 rc = ata_pci_device_do_resume(pdev);
 
@@ -1303,9 +1304,11 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev)
                         no_piix_dma = 2;
         }
         if (no_piix_dma)
-                dev_printk(KERN_WARNING, &ata_dev->dev, "450NX errata present, disabling IDE DMA.\n");
-        if (no_piix_dma == 2)
-                dev_printk(KERN_WARNING, &ata_dev->dev, "A BIOS update may resolve this.\n");
+                dev_warn(&ata_dev->dev,
+                         "450NX errata present, disabling IDE DMA%s\n",
+                         no_piix_dma == 2 ? " - a BIOS update may resolve this"
+                         : "");
+
         return no_piix_dma;
 }
 
@@ -1338,37 +1341,36 @@ static const int *__devinit piix_init_sata_map(struct pci_dev *pdev,
 
         map = map_db->map[map_value & map_db->mask];
 
-        dev_printk(KERN_INFO, &pdev->dev, "MAP [");
+        dev_info(&pdev->dev, "MAP [");
         for (i = 0; i < 4; i++) {
                 switch (map[i]) {
                 case RV:
                         invalid_map = 1;
-                        printk(" XX");
+                        pr_cont(" XX");
                         break;
 
                 case NA:
-                        printk(" --");
+                        pr_cont(" --");
                         break;
 
                 case IDE:
                         WARN_ON((i & 1) || map[i + 1] != IDE);
                         pinfo[i / 2] = piix_port_info[ich_pata_100];
                         i++;
-                        printk(" IDE IDE");
+                        pr_cont(" IDE IDE");
                         break;
 
                 default:
-                        printk(" P%d", map[i]);
+                        pr_cont(" P%d", map[i]);
                         if (i & 1)
                                 pinfo[i / 2].flags |= ATA_FLAG_SLAVE_POSS;
                         break;
                 }
         }
-        printk(" ]\n");
+        pr_cont(" ]\n");
 
         if (invalid_map)
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "invalid MAP value %u\n", map_value);
+                dev_err(&pdev->dev, "invalid MAP value %u\n", map_value);
 
         return map;
 }
@@ -1398,8 +1400,8 @@ static bool piix_no_sidpr(struct ata_host *host)
         if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2920 &&
             pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG &&
             pdev->subsystem_device == 0xb049) {
-                dev_printk(KERN_WARNING, host->dev,
-                           "Samsung DB-P70 detected, disabling SIDPR\n");
+                dev_warn(host->dev,
+                         "Samsung DB-P70 detected, disabling SIDPR\n");
                 return true;
         }
 
@@ -1451,8 +1453,8 @@ static int __devinit piix_init_sidpr(struct ata_host *host)
                 piix_sidpr_scr_read(link0, SCR_CONTROL, &scontrol);
 
                 if ((scontrol & 0xf00) != 0x300) {
-                        dev_printk(KERN_INFO, host->dev, "SCR access via "
-                                   "SIDPR is available but doesn't work\n");
+                        dev_info(host->dev,
+                                 "SCR access via SIDPR is available but doesn't work\n");
                         return 0;
                 }
         }
@@ -1501,8 +1503,7 @@ static void piix_iocfg_bit18_quirk(struct ata_host *host)
          * affected systems.
          */
         if (hpriv->saved_iocfg & (1 << 18)) {
-                dev_printk(KERN_INFO, &pdev->dev,
-                           "applying IOCFG bit18 quirk\n");
+                dev_info(&pdev->dev, "applying IOCFG bit18 quirk\n");
                 pci_write_config_dword(pdev, PIIX_IOCFG,
                                        hpriv->saved_iocfg & ~(1 << 18));
         }