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

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

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index b0975a5ad8c4ad195e2200f2e45c1a10bcf689b8..dc6b5dae0463e377ce45ba379f9421480a06c8eb 100644 (file)
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -60,7 +60,7 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
                UT = T / 2;
 
        if (ata_timing_compute(adev, speed, &at, T, UT) < 0) {
-               dev_printk(KERN_ERR, &pdev->dev, "unknown mode %d.\n", speed);
+               dev_err(&pdev->dev, "unknown mode %d\n", speed);
                return;
        }
 
@@ -311,7 +311,7 @@ static unsigned long nv_mode_filter(struct ata_device *dev,
           cable detection result */
        limit |= ata_pack_xfermask(ATA_PIO4, ATA_MWDMA2, ATA_UDMA2);
 
-       ata_port_printk(ap, KERN_DEBUG, "nv_mode_filter: 0x%lx&0x%lx->0x%lx, "
+       ata_port_dbg(ap, "nv_mode_filter: 0x%lx&0x%lx->0x%lx, "
                        "BIOS=0x%lx (0x%x) ACPI=0x%lx%s\n",
                        xfer_mask, limit, xfer_mask & limit, bios_limit,
                        saved_udma, acpi_limit, acpi_str);
@@ -530,14 +530,12 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                }
        };
        const struct ata_port_info *ppi[] = { NULL, NULL };
-       static int printed_version;
        int type = id->driver_data;
        void *hpriv = NULL;
        u8 fifo;
        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)