Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / drivers / ata / sata_sil24.c

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 06c564e..55470f3 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -694,7 +694,7 @@ static int sil24_softreset(struct ata_link *link, unsigned int *class,
        return 0;
 
  err:
-       ata_link_printk(link, KERN_ERR, "softreset failed (%s)\n", reason);
+       ata_link_err(link, "softreset failed (%s)\n", reason);
        return -EIO;
 }
 
@@ -714,8 +714,8 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class,
         * This happens often after PM DMA CS errata.
         */
        if (pp->do_port_rst) {
-               ata_port_printk(ap, KERN_WARNING, "controller in dubious "
-                               "state, performing PORT_RST\n");
+               ata_port_warn(ap,
+                             "controller in dubious state, performing PORT_RST\n");
 
                writel(PORT_CS_PORT_RST, port + PORT_CTRL_STAT);
                ata_msleep(ap, 10);
@@ -773,7 +773,7 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class,
                goto retry;
        }
 
-       ata_link_printk(link, KERN_ERR, "hardreset failed (%s)\n", reason);
+       ata_link_err(link, "hardreset failed (%s)\n", reason);
        return -EIO;
 }
 
@@ -925,7 +925,7 @@ static void sil24_pmp_attach(struct ata_port *ap)
 
        if (sata_pmp_gscr_vendor(gscr) == 0x11ab &&
            sata_pmp_gscr_devid(gscr) == 0x4140) {
-               ata_port_printk(ap, KERN_INFO,
+               ata_port_info(ap,
                        "disabling NCQ support due to sil24-mv4140 quirk\n");
                ap->flags &= ~ATA_FLAG_NCQ;
        }
@@ -946,8 +946,7 @@ static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class,
 
        rc = sil24_init_port(link->ap);
        if (rc) {
-               ata_link_printk(link, KERN_ERR,
-                               "hardreset failed (port not ready)\n");
+               ata_link_err(link, "hardreset failed (port not ready)\n");
                return rc;
        }
 
@@ -1141,8 +1140,8 @@ static inline void sil24_host_intr(struct ata_port *ap)
 
        /* spurious interrupts are expected if PCIX_IRQ_WOC */
        if (!(ap->flags & SIL24_FLAG_PCIX_IRQ_WOC) && ata_ratelimit())
-               ata_port_printk(ap, KERN_INFO, "spurious interrupt "
-                       "(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
+               ata_port_info(ap,
+                       "spurious interrupt (slot_stat 0x%x active_tag %d sactive 0x%x)\n",
                        slot_stat, ap->link.active_tag, ap->link.sactive);
 }
 
@@ -1256,8 +1255,8 @@ static void sil24_init_controller(struct ata_host *host)
                                                PORT_CS_PORT_RST,
                                                PORT_CS_PORT_RST, 10, 100);
                        if (tmp & PORT_CS_PORT_RST)
-                               dev_printk(KERN_ERR, host->dev,
-                                          "failed to clear port RST\n");
+                               dev_err(host->dev,
+                                       "failed to clear port RST\n");
                }
 
                /* configure port */
@@ -1271,7 +1270,6 @@ static void sil24_init_controller(struct ata_host *host)
 static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        extern int __MARKER__sil24_cmd_block_is_sized_wrongly;
-       static int printed_version;
        struct ata_port_info pi = sil24_port_info[ent->driver_data];
        const struct ata_port_info *ppi[] = { &pi, NULL };
        void __iomem * const *iomap;
@@ -1283,8 +1281,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (sizeof(union sil24_cmd_block) != PAGE_SIZE)
                __MARKER__sil24_cmd_block_is_sized_wrongly = 1;
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        /* acquire resources */
        rc = pcim_enable_device(pdev);
@@ -1302,9 +1299,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (pi.flags & SIL24_FLAG_PCIX_IRQ_WOC) {
                tmp = readl(iomap[SIL24_HOST_BAR] + HOST_CTRL);
                if (tmp & (HOST_CTRL_TRDY | HOST_CTRL_STOP | HOST_CTRL_DEVSEL))
-                       dev_printk(KERN_INFO, &pdev->dev,
-                                  "Applying completion IRQ loss on PCI-X "
-                                  "errata fix\n");
+                       dev_info(&pdev->dev,
+                                "Applying completion IRQ loss on PCI-X errata fix\n");
                else
                        pi.flags &= ~SIL24_FLAG_PCIX_IRQ_WOC;
        }
@@ -1322,22 +1318,21 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                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;
                }
        }
@@ -1350,7 +1345,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        sil24_init_controller(host);
 
        if (sata_sil24_msi && !pci_enable_msi(pdev)) {
-               dev_printk(KERN_INFO, &pdev->dev, "Using MSI\n");
+               dev_info(&pdev->dev, "Using MSI\n");
                pci_intx(pdev, 0);
        }