Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima...

[~andy/linux] / drivers / ata / sata_via.c

diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 54434db15b122e49ddefef9f68a84046019c72a3..f93e43b0ccd8fc7162884b987dcf9919c243e432 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -360,9 +360,9 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)
 
        online = (sstatus & 0xf) == 0x3;
 
-       ata_port_printk(ap, KERN_INFO,
-                       "SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n",
-                       online ? "up" : "down", sstatus, scontrol);
+       ata_port_info(ap,
+                     "SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n",
+                     online ? "up" : "down", sstatus, scontrol);
 
        /* SStatus is read one more time */
        svia_scr_read(link, SCR_STATUS, &sstatus);
@@ -469,7 +469,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
 
        rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME);
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n");
+               dev_err(&pdev->dev, "failed to iomap PCI BAR 5\n");
                return rc;
        }
 
@@ -488,14 +488,14 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
 
        *r_host = host = ata_host_alloc_pinfo(&pdev->dev, ppi, ARRAY_SIZE(ppi));
        if (!host) {
-               dev_printk(KERN_ERR, &pdev->dev, "failed to allocate host\n");
+               dev_err(&pdev->dev, "failed to allocate host\n");
                return -ENOMEM;
        }
 
        rc = pcim_iomap_regions(pdev, 0x3f, DRV_NAME);
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev, "failed to request/iomap "
-                          "PCI BARs (errno=%d)\n", rc);
+               dev_err(&pdev->dev, "failed to request/iomap PCI BARs (errno=%d)\n",
+                       rc);
                return rc;
        }
        host->iomap = pcim_iomap_table(pdev);
@@ -526,7 +526,7 @@ static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
 
        rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME);
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n");
+               dev_err(&pdev->dev, "failed to iomap PCI BAR 5\n");
                return rc;
        }
 
@@ -542,15 +542,14 @@ static void svia_configure(struct pci_dev *pdev, int board_id)
        u8 tmp8;
 
        pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, &tmp8);
-       dev_printk(KERN_INFO, &pdev->dev, "routed to hard irq line %d\n",
-              (int) (tmp8 & 0xf0) == 0xf0 ? 0 : tmp8 & 0x0f);
+       dev_info(&pdev->dev, "routed to hard irq line %d\n",
+                (int) (tmp8 & 0xf0) == 0xf0 ? 0 : tmp8 & 0x0f);
 
        /* make sure SATA channels are enabled */
        pci_read_config_byte(pdev, SATA_CHAN_ENAB, &tmp8);
        if ((tmp8 & ALL_PORTS) != ALL_PORTS) {
-               dev_printk(KERN_DEBUG, &pdev->dev,
-                          "enabling SATA channels (0x%x)\n",
-                          (int) tmp8);
+               dev_dbg(&pdev->dev, "enabling SATA channels (0x%x)\n",
+                       (int)tmp8);
                tmp8 |= ALL_PORTS;
                pci_write_config_byte(pdev, SATA_CHAN_ENAB, tmp8);
        }
@@ -558,9 +557,8 @@ static void svia_configure(struct pci_dev *pdev, int board_id)
        /* make sure interrupts for each channel sent to us */
        pci_read_config_byte(pdev, SATA_INT_GATE, &tmp8);
        if ((tmp8 & ALL_PORTS) != ALL_PORTS) {
-               dev_printk(KERN_DEBUG, &pdev->dev,
-                          "enabling SATA channel interrupts (0x%x)\n",
-                          (int) tmp8);
+               dev_dbg(&pdev->dev, "enabling SATA channel interrupts (0x%x)\n",
+                       (int) tmp8);
                tmp8 |= ALL_PORTS;
                pci_write_config_byte(pdev, SATA_INT_GATE, tmp8);
        }
@@ -568,9 +566,9 @@ static void svia_configure(struct pci_dev *pdev, int board_id)
        /* make sure native mode is enabled */
        pci_read_config_byte(pdev, SATA_NATIVE_MODE, &tmp8);
        if ((tmp8 & NATIVE_MODE_ALL) != NATIVE_MODE_ALL) {
-               dev_printk(KERN_DEBUG, &pdev->dev,
-                          "enabling SATA channel native mode (0x%x)\n",
-                          (int) tmp8);
+               dev_dbg(&pdev->dev,
+                       "enabling SATA channel native mode (0x%x)\n",
+                       (int) tmp8);
                tmp8 |= NATIVE_MODE_ALL;
                pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8);
        }
@@ -606,15 +604,13 @@ static void svia_configure(struct pci_dev *pdev, int board_id)
 
 static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       static int printed_version;
        unsigned int i;
        int rc;
        struct ata_host *host = NULL;
        int board_id = (int) ent->driver_data;
        const unsigned *bar_sizes;
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        rc = pcim_enable_device(pdev);
        if (rc)
@@ -628,7 +624,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++)
                if ((pci_resource_start(pdev, i) == 0) ||
                    (pci_resource_len(pdev, i) < bar_sizes[i])) {
-                       dev_printk(KERN_ERR, &pdev->dev,
+                       dev_err(&pdev->dev,
                                "invalid PCI BAR %u (sz 0x%llx, val 0x%llx)\n",
                                i,
                                (unsigned long long)pci_resource_start(pdev, i),