1 files changed, 12 insertions, 17 deletions

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 1cc70e33d5a3..78ae7b67b09e 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -346,12 +346,11 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc,
 
                 /* warn if each s/g element is not dword aligned */
                 if (sg_addr & 0x03)
-                        ata_port_printk(qc->ap, KERN_ERR,
-                                        "s/g addr unaligned : 0x%llx\n",
-                                        (unsigned long long)sg_addr);
+                        ata_port_err(qc->ap, "s/g addr unaligned : 0x%llx\n",
+                                     (unsigned long long)sg_addr);
                 if (sg_len & 0x03)
-                        ata_port_printk(qc->ap, KERN_ERR,
-                                        "s/g len unaligned : 0x%x\n", sg_len);
+                        ata_port_err(qc->ap, "s/g len unaligned : 0x%x\n",
+                                     sg_len);
 
                 if (num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1) &&
                     sg_next(sg) != NULL) {
@@ -739,8 +738,7 @@ try_offline_again:
                                  1, 500);
 
         if (temp & ONLINE) {
-                ata_port_printk(ap, KERN_ERR,
-                                "Hardreset failed, not off-lined %d\n", i);
+                ata_port_err(ap, "Hardreset failed, not off-lined %d\n", i);
 
                 /*
                  * Try to offline controller atleast twice
@@ -776,8 +774,7 @@ try_offline_again:
         temp = ata_wait_register(ap, hcr_base + HSTATUS, ONLINE, 0, 1, 500);
 
         if (!(temp & ONLINE)) {
-                ata_port_printk(ap, KERN_ERR,
-                                "Hardreset failed, not on-lined\n");
+                ata_port_err(ap, "Hardreset failed, not on-lined\n");
                 goto err;
         }
 
@@ -793,9 +790,8 @@ try_offline_again:
 
         temp = ata_wait_register(ap, hcr_base + HSTATUS, 0xFF, 0, 1, 500);
         if ((!(temp & 0x10)) || ata_link_offline(link)) {
-                ata_port_printk(ap, KERN_WARNING,
-                                "No Device OR PHYRDY change,Hstatus = 0x%x\n",
-                                ioread32(hcr_base + HSTATUS));
+                ata_port_warn(ap, "No Device OR PHYRDY change,Hstatus = 0x%x\n",
+                              ioread32(hcr_base + HSTATUS));
                 *class = ATA_DEV_NONE;
                 return 0;
         }
@@ -808,13 +804,12 @@ try_offline_again:
                         500, jiffies_to_msecs(deadline - start_jiffies));
 
         if ((temp & 0xFF) != 0x18) {
-                ata_port_printk(ap, KERN_WARNING, "No Signature Update\n");
+                ata_port_warn(ap, "No Signature Update\n");
                 *class = ATA_DEV_NONE;
                 goto do_followup_srst;
         } else {
-                ata_port_printk(ap, KERN_INFO,
-                                "Signature Update detected @ %d msecs\n",
-                                jiffies_to_msecs(jiffies - start_jiffies));
+                ata_port_info(ap, "Signature Update detected @ %d msecs\n",
+                              jiffies_to_msecs(jiffies - start_jiffies));
                 *class = sata_fsl_dev_classify(ap);
                 return 0;
         }
@@ -889,7 +884,7 @@ static int sata_fsl_softreset(struct ata_link *link, unsigned int *class,
 
         temp = ata_wait_register(ap, CQ + hcr_base, 0x1, 0x1, 1, 5000);
         if (temp & 0x1) {
-                ata_port_printk(ap, KERN_WARNING, "ATA_SRST issue failed\n");
+                ata_port_warn(ap, "ATA_SRST issue failed\n");
 
                 DPRINTK("Softreset@5000,CQ=0x%x,CA=0x%x,CC=0x%x\n",
                         ioread32(CQ + hcr_base),