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 0fc1582005e8fa4eb1e5f709f5c43312e9bfd95e..f93e43b0ccd8fc7162884b987dcf9919c243e432 100644 (file)
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -548,9 +548,8 @@ static void svia_configure(struct pci_dev *pdev, int board_id)
        /* 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)