Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / drivers / ata / pata_octeon_cf.c

diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index 220ddc90608f357ac411c05ccc589b5d8abe56c6..1d61d5d278fa4412130d7dcd1336cd45bc9662aa 100644 (file)
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -405,7 +405,7 @@ static int octeon_cf_softreset16(struct ata_link *link, unsigned int *classes,
 
        rc = ata_sff_wait_after_reset(link, 1, deadline);
        if (rc) {
-               ata_link_printk(link, KERN_ERR, "SRST failed (errno=%d)\n", rc);
+               ata_link_err(link, "SRST failed (errno=%d)\n", rc);
                return rc;
        }
 
@@ -807,6 +807,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
        irq_handler_t irq_handler = NULL;
        void __iomem *base;
        struct octeon_cf_port *cf_port;
+       char version[32];
 
        res_cs0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
@@ -905,10 +906,11 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
        ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr);
 
 
-       dev_info(&pdev->dev, "version " DRV_VERSION" %d bit%s.\n",
+       snprintf(version, sizeof(version), "%s %d bit%s",
+                DRV_VERSION,
                 (ocd->is16bit) ? 16 : 8,
                 (cs1) ? ", True IDE" : "");
-
+       ata_print_version_once(&pdev->dev, version);
 
        return ata_host_activate(host, irq, irq_handler, 0, &octeon_cf_sht);