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

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

diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 83a4447..5c7d70c 100644 (file)
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -396,9 +396,8 @@ static void inic_host_intr(struct ata_port *ap)
        }
 
  spurious:
-       ata_port_printk(ap, KERN_WARNING, "unhandled interrupt: "
-                       "cmd=0x%x irq_stat=0x%x idma_stat=0x%x\n",
-                       qc ? qc->tf.command : 0xff, irq_stat, idma_stat);
+       ata_port_warn(ap, "unhandled interrupt: cmd=0x%x irq_stat=0x%x idma_stat=0x%x\n",
+                     qc ? qc->tf.command : 0xff, irq_stat, idma_stat);
 }
 
 static irqreturn_t inic_interrupt(int irq, void *dev_instance)
@@ -619,8 +618,9 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class,
 
        rc = sata_link_resume(link, timing, deadline);
        if (rc) {
-               ata_link_printk(link, KERN_WARNING, "failed to resume "
-                               "link after reset (errno=%d)\n", rc);
+               ata_link_warn(link,
+                             "failed to resume link after reset (errno=%d)\n",
+                             rc);
                return rc;
        }
 
@@ -632,8 +632,9 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class,
                rc = ata_wait_after_reset(link, deadline, inic_check_ready);
                /* link occupied, -ENODEV too is an error */
                if (rc) {
-                       ata_link_printk(link, KERN_WARNING, "device not ready "
-                                       "after hardreset (errno=%d)\n", rc);
+                       ata_link_warn(link,
+                                     "device not ready after hardreset (errno=%d)\n",
+                                     rc);
                        return rc;
                }
 
@@ -799,7 +800,6 @@ static int inic_pci_device_resume(struct pci_dev *pdev)
 
 static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       static int printed_version;
        const struct ata_port_info *ppi[] = { &inic_port_info, NULL };
        struct ata_host *host;
        struct inic_host_priv *hpriv;
@@ -807,8 +807,7 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        int mmio_bar;
        int i, rc;
 
-       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, NR_PORTS);
@@ -847,15 +846,13 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Set dma_mask.  This devices doesn't support 64bit addressing. */
        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;
        }
 
@@ -866,15 +863,13 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
        rc = pci_set_dma_max_seg_size(pdev, 65536 - 512);
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev,
-                          "failed to set the maximum segment size.\n");
+               dev_err(&pdev->dev, "failed to set the maximum segment size\n");
                return rc;
        }
 
        rc = init_controller(hpriv->mmio_base, hpriv->cached_hctl);
        if (rc) {
-               dev_printk(KERN_ERR, &pdev->dev,
-                          "failed to initialize controller\n");
+               dev_err(&pdev->dev, "failed to initialize controller\n");
                return rc;
        }