Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konra...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pata_macio.c

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 46f589edccdb42c9727c6ec0e15feb60cdff9c23..b057e3fa44bcac0b39193335ab559e7bec314891 100644 (file)
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -772,8 +772,9 @@ static void pata_macio_reset_hw(struct pata_macio_priv *priv, int resume)
                pci_restore_state(priv->pdev);
                rc = pcim_enable_device(priv->pdev);
                if (rc)
-                       dev_printk(KERN_ERR, &priv->pdev->dev,
-                                  "Failed to enable device after resume (%d)\n", rc);
+                       dev_err(&priv->pdev->dev,
+                               "Failed to enable device after resume (%d)\n",
+                               rc);
                else
                        pci_set_master(priv->pdev);
        }
@@ -812,7 +813,7 @@ static int pata_macio_slave_config(struct scsi_device *sdev)
                blk_queue_update_dma_pad(sdev->request_queue, 31);
 
                /* Tell the world about it */
-               ata_dev_printk(dev, KERN_INFO, "OHare alignment limits applied\n");
+               ata_dev_info(dev, "OHare alignment limits applied\n");
                return 0;
        }
 
@@ -838,8 +839,7 @@ static int pata_macio_slave_config(struct scsi_device *sdev)
                                      cmd | PCI_COMMAND_INVALIDATE);
 
                /* Tell the world about it */
-               ata_dev_printk(dev, KERN_INFO,
-                              "K2/Shasta alignment limits applied\n");
+               ata_dev_info(dev, "K2/Shasta alignment limits applied\n");
        }
 
        return 0;