Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 4d04471..aca321e 100644 (file)
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -44,7 +44,7 @@ static int rz1000_set_mode(struct ata_link *link, struct ata_device **unused)
                dev->xfer_mode = XFER_PIO_0;
                dev->xfer_shift = ATA_SHIFT_PIO;
                dev->flags |= ATA_DFLAG_PIO;
-               ata_dev_printk(dev, KERN_INFO, "configured for PIO\n");
+               ata_dev_info(dev, "configured for PIO\n");
        }
        return 0;
 }
@@ -92,7 +92,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en
        };
        const struct ata_port_info *ppi[] = { &info, NULL };
 
-       printk_once(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        if (rz1000_fifo_disable(pdev) == 0)
                return ata_pci_sff_init_one(pdev, ppi, &rz1000_sht, NULL, 0);