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

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

diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 7c98737..6135a52 100644 (file)
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -273,9 +273,8 @@ static irqreturn_t vsc_sata_interrupt(int irq, void *dev_instance)
 
        if (unlikely(status == 0xffffffff || status == 0)) {
                if (status)
-                       dev_printk(KERN_ERR, host->dev,
-                               ": IRQ status == 0xffffffff, "
-                               "PCI fault or device removal?\n");
+                       dev_err(host->dev,
+                               ": IRQ status == 0xffffffff, PCI fault or device removal?\n");
                goto out;
        }
 
@@ -347,14 +346,12 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev,
                .port_ops       = &vsc_sata_ops,
        };
        const struct ata_port_info *ppi[] = { &pi, NULL };
-       static int printed_version;
        struct ata_host *host;
        void __iomem *mmio_base;
        int i, rc;
        u8 cls;
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        /* allocate host */
        host = ata_host_alloc_pinfo(&pdev->dev, ppi, 4);