Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

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

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 1111712b3d7d8319abf4c8209d5f5c767e748ab5..04911d52f59d540ffb6e9af767eaccb3651252c6 100644 (file)
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -596,14 +596,12 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
 
        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev,
-                       "32-bit DMA enable failed\n");
+               dev_err(&pdev->dev, "32-bit DMA enable failed\n");
                return rc;
        }
        rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev,
-                       "32-bit consistent DMA enable failed\n");
+               dev_err(&pdev->dev, "32-bit consistent DMA enable failed\n");
                return rc;
        }
        return 0;
@@ -612,15 +610,13 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
 static int adma_ata_init_one(struct pci_dev *pdev,
                             const struct pci_device_id *ent)
 {
-       static int printed_version;
        unsigned int board_idx = (unsigned int) ent->driver_data;
        const struct ata_port_info *ppi[] = { &adma_port_info[board_idx], NULL };
        struct ata_host *host;
        void __iomem *mmio_base;
        int rc, port_no;
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        /* alloc host */
        host = ata_host_alloc_pinfo(&pdev->dev, ppi, ADMA_PORTS);