Merge branch 'master'

1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 25a47d7afa2..8420204c2ea 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -41,6 +41,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -682,10 +683,10 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
                         if (!ahci_host_intr(ap, qc))
                                 if (ata_ratelimit()) {
                                         struct pci_dev *pdev =
-                                          to_pci_dev(ap->host_set->dev);
-                                        printk(KERN_WARNING
-                                          "ahci(%s): unhandled interrupt on port %u\n",
-                                          pci_name(pdev), i);
+                                                to_pci_dev(ap->host_set->dev);
+                                        dev_printk(KERN_WARNING, &pdev->dev,
+                                          "unhandled interrupt on port %u\n",
+                                          i);
                                 }
 
                         VPRINTK("port %u\n", i);
@@ -693,10 +694,9 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
                         VPRINTK("port %u (no irq)\n", i);
                         if (ata_ratelimit()) {
                                 struct pci_dev *pdev =
-                                  to_pci_dev(ap->host_set->dev);
-                                printk(KERN_WARNING
-                                  "ahci(%s): interrupt on disabled port %u\n",
-                                  pci_name(pdev), i);
+                                        to_pci_dev(ap->host_set->dev);
+                                dev_printk(KERN_WARNING, &pdev->dev,
+                                        "interrupt on disabled port %u\n", i);
                         }
                 }
 
@@ -768,8 +768,8 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
 
         tmp = readl(mmio + HOST_CTL);
         if (tmp & HOST_RESET) {
-                printk(KERN_ERR DRV_NAME "(%s): controller reset failed (0x%x)\n",
-                        pci_name(pdev), tmp);
+                dev_printk(KERN_ERR, &pdev->dev,
+                           "controller reset failed (0x%x)\n", tmp);
                 return -EIO;
         }
 
@@ -797,22 +797,22 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
                 if (rc) {
                         rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                         if (rc) {
-                                printk(KERN_ERR DRV_NAME "(%s): 64-bit DMA enable failed\n",
-                                        pci_name(pdev));
+                                dev_printk(KERN_ERR, &pdev->dev,
+                                           "64-bit DMA enable failed\n");
                                 return rc;
                         }
                 }
         } else {
                 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
-                        printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",
-                                pci_name(pdev));
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "32-bit DMA enable failed\n");
                         return rc;
                 }
                 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
-                        printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",
-                                pci_name(pdev));
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "32-bit consistent DMA enable failed\n");
                         return rc;
                 }
         }
@@ -915,10 +915,10 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
         else
                 scc_s = "unknown";
 
-        printk(KERN_INFO DRV_NAME "(%s) AHCI %02x%02x.%02x%02x "
+        dev_printk(KERN_INFO, &pdev->dev,
+                "AHCI %02x%02x.%02x%02x "
                 "%u slots %u ports %s Gbps 0x%x impl %s mode\n"
                 ,
-                pci_name(pdev),
 
                 (vers >> 24) & 0xff,
                 (vers >> 16) & 0xff,
@@ -931,11 +931,11 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
                 impl,
                 scc_s);
 
-        printk(KERN_INFO DRV_NAME "(%s) flags: "
+        dev_printk(KERN_INFO, &pdev->dev,
+                "flags: "
                 "%s%s%s%s%s%s"
                 "%s%s%s%s%s%s%s\n"
                 ,
-                pci_name(pdev),
 
                 cap & (1 << 31) ? "64bit " : "",
                 cap & (1 << 30) ? "ncq " : "",
@@ -968,7 +968,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         VPRINTK("ENTER\n");
 
         if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
         rc = pci_enable_device(pdev);
         if (rc)