Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pata_via.c

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index ac8d7d97e4085d4122b33fbd58bde6951f3ef2e7..65e4be6be22061c882c9763661b319c0725f3d5d 100644 (file)
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -350,8 +350,8 @@ static unsigned long via_mode_filter(struct ata_device *dev, unsigned long mask)
        if (config->id == PCI_DEVICE_ID_VIA_82C586_0) {
                ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
                if (strcmp(model_num, "TS64GSSD25-M") == 0) {
-                       ata_dev_printk(dev, KERN_WARNING,
-       "disabling UDMA mode due to reported lockups with this device.\n");
+                       ata_dev_warn(dev,
+       "disabling UDMA mode due to reported lockups with this device\n");
                        mask &= ~ ATA_MASK_UDMA;
                }
        }
@@ -551,14 +551,12 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        const struct ata_port_info *ppi[] = { NULL, NULL };
        struct pci_dev *isa;
        const struct via_isa_bridge *config;
-       static int printed_version;
        u8 enable;
        u32 timing;
        unsigned long flags = id->driver_data;
        int rc;
 
-       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)