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

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

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index fe16ee8f194b5f42e7c1c2babb372727f79d7bd3..98c1d780f552505aac129cf2133b98576161e6ca 100644 (file)
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -643,8 +643,8 @@ static void sil_dev_config(struct ata_device *dev)
            ((ap->flags & SIL_FLAG_MOD15WRITE) &&
             (quirks & SIL_QUIRK_MOD15WRITE))) {
                if (print_info)
-                       ata_dev_printk(dev, KERN_INFO, "applying Seagate "
-                                      "errata fix (mod15write workaround)\n");
+                       ata_dev_info(dev,
+               "applying Seagate errata fix (mod15write workaround)\n");
                dev->max_sectors = 15;
                return;
        }
@@ -652,8 +652,8 @@ static void sil_dev_config(struct ata_device *dev)
        /* limit to udma5 */
        if (quirks & SIL_QUIRK_UDMA5MAX) {
                if (print_info)
-                       ata_dev_printk(dev, KERN_INFO, "applying Maxtor "
-                                      "errata fix %s\n", model_num);
+                       ata_dev_info(dev, "applying Maxtor errata fix %s\n",
+                                    model_num);
                dev->udma_mask &= ATA_UDMA5;
                return;
        }
@@ -732,7 +732,6 @@ static bool sil_broken_system_poweroff(struct pci_dev *pdev)
 
 static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       static int printed_version;
        int board_id = ent->driver_data;
        struct ata_port_info pi = sil_port_info[board_id];
        const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -741,8 +740,7 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        int n_ports, rc;
        unsigned int i;
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        /* allocate host */
        n_ports = 2;