mmc: replace printk with appropriate display macro

All the files using printk function for displaying kernel messages
in the mmc driver have been replaced with corresponding macro.

Signed-off-by: Girish K S <girish.shivananjappa@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

9 files changed, 51 insertions, 51 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 393d817ed040..46b6e84d953e 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -295,7 +295,7 @@ int mmc_add_card(struct mmc_card *card)
         }
 
         if (mmc_host_is_spi(card->host)) {
-                printk(KERN_INFO "%s: new %s%s%s card on SPI\n",
+                pr_info("%s: new %s%s%s card on SPI\n",
                         mmc_hostname(card->host),
                         mmc_card_highspeed(card) ? "high speed " : "",
                         mmc_card_ddr_mode(card) ? "DDR " : "",
@@ -334,10 +334,10 @@ void mmc_remove_card(struct mmc_card *card)
 
         if (mmc_card_present(card)) {
                 if (mmc_host_is_spi(card->host)) {
-                        printk(KERN_INFO "%s: SPI card removed\n",
+                        pr_info("%s: SPI card removed\n",
                                 mmc_hostname(card->host));
                 } else {
-                        printk(KERN_INFO "%s: card %04x removed\n",
+                        pr_info("%s: card %04x removed\n",
                                 mmc_hostname(card->host), card->rca);
                 }
                 device_del(&card->dev);
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index ec7694903008..61d7730bc8b2 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1541,7 +1541,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
         cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
         err = mmc_wait_for_cmd(card->host, &cmd, 0);
         if (err) {
-                printk(KERN_ERR "mmc_erase: group start error %d, "
+                pr_err("mmc_erase: group start error %d, "
                        "status %#x\n", err, cmd.resp[0]);
                 err = -EIO;
                 goto out;
@@ -1556,7 +1556,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
         cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
         err = mmc_wait_for_cmd(card->host, &cmd, 0);
         if (err) {
-                printk(KERN_ERR "mmc_erase: group end error %d, status %#x\n",
+                pr_err("mmc_erase: group end error %d, status %#x\n",
                        err, cmd.resp[0]);
                 err = -EIO;
                 goto out;
@@ -1569,7 +1569,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
         cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty);
         err = mmc_wait_for_cmd(card->host, &cmd, 0);
         if (err) {
-                printk(KERN_ERR "mmc_erase: erase error %d, status %#x\n",
+                pr_err("mmc_erase: erase error %d, status %#x\n",
                        err, cmd.resp[0]);
                 err = -EIO;
                 goto out;
@@ -1586,7 +1586,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
                 /* Do not retry else we can't see errors */
                 err = mmc_wait_for_cmd(card->host, &cmd, 0);
                 if (err || (cmd.resp[0] & 0xFDF92000)) {
-                        printk(KERN_ERR "error %d requesting status %#x\n",
+                        pr_err("error %d requesting status %#x\n",
                                 err, cmd.resp[0]);
                         err = -EIO;
                         goto out;
@@ -2177,7 +2177,7 @@ int mmc_resume_host(struct mmc_host *host)
                 BUG_ON(!host->bus_ops->resume);
                 err = host->bus_ops->resume(host);
                 if (err) {
-                        printk(KERN_WARNING "%s: error %d during resume "
+                        pr_warning("%s: error %d during resume "
                                             "(card was removed?)\n",
                                             mmc_hostname(host), err);
                         err = 0;
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 7dde373d1439..4e869d371a03 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -101,7 +101,7 @@ static int mmc_decode_cid(struct mmc_card *card)
                 break;
 
         default:
-                printk(KERN_ERR "%s: card has unknown MMCA version %d\n",
+                pr_err("%s: card has unknown MMCA version %d\n",
                         mmc_hostname(card->host), card->csd.mmca_vsn);
                 return -EINVAL;
         }
@@ -135,7 +135,7 @@ static int mmc_decode_csd(struct mmc_card *card)
          */
         csd->structure = UNSTUFF_BITS(resp, 126, 2);
         if (csd->structure == 0) {
-                printk(KERN_ERR "%s: unrecognised CSD structure version %d\n",
+                pr_err("%s: unrecognised CSD structure version %d\n",
                         mmc_hostname(card->host), csd->structure);
                 return -EINVAL;
         }
@@ -195,7 +195,7 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
          */
         ext_csd = kmalloc(512, GFP_KERNEL);
         if (!ext_csd) {
-                printk(KERN_ERR "%s: could not allocate a buffer to "
+                pr_err("%s: could not allocate a buffer to "
                         "receive the ext_csd.\n", mmc_hostname(card->host));
                 return -ENOMEM;
         }
@@ -217,12 +217,12 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
                  * stored in their CSD.
                  */
                 if (card->csd.capacity == (4096 * 512)) {
-                        printk(KERN_ERR "%s: unable to read EXT_CSD "
+                        pr_err("%s: unable to read EXT_CSD "
                                 "on a possible high capacity card. "
                                 "Card will be ignored.\n",
                                 mmc_hostname(card->host));
                 } else {
-                        printk(KERN_WARNING "%s: unable to read "
+                        pr_warning("%s: unable to read "
                                 "EXT_CSD, performance might "
                                 "suffer.\n",
                                 mmc_hostname(card->host));
@@ -252,7 +252,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
         card->ext_csd.raw_ext_csd_structure = ext_csd[EXT_CSD_STRUCTURE];
         if (card->csd.structure == 3) {
                 if (card->ext_csd.raw_ext_csd_structure > 2) {
-                        printk(KERN_ERR "%s: unrecognised EXT_CSD structure "
+                        pr_err("%s: unrecognised EXT_CSD structure "
                                 "version %d\n", mmc_hostname(card->host),
                                         card->ext_csd.raw_ext_csd_structure);
                         err = -EINVAL;
@@ -262,7 +262,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
 
         card->ext_csd.rev = ext_csd[EXT_CSD_REV];
         if (card->ext_csd.rev > 6) {
-                printk(KERN_ERR "%s: unrecognised EXT_CSD revision %d\n",
+                pr_err("%s: unrecognised EXT_CSD revision %d\n",
                         mmc_hostname(card->host), card->ext_csd.rev);
                 err = -EINVAL;
                 goto out;
@@ -308,7 +308,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
                 break;
         default:
                 /* MMC v4 spec says this cannot happen */
-                printk(KERN_WARNING "%s: card is mmc v4 but doesn't "
+                pr_warning("%s: card is mmc v4 but doesn't "
                         "support any high-speed modes.\n",
                         mmc_hostname(card->host));
         }
@@ -857,7 +857,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                         goto free_card;
 
                 if (err) {
-                        printk(KERN_WARNING "%s: switch to highspeed failed\n",
+                        pr_warning("%s: switch to highspeed failed\n",
                                mmc_hostname(card->host));
                         err = 0;
                 } else {
@@ -966,7 +966,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                                          card->ext_csd.generic_cmd6_time);
                 }
                 if (err) {
-                        printk(KERN_WARNING "%s: switch to bus width %d ddr %d "
+                        pr_warning("%s: switch to bus width %d ddr %d "
                                 "failed\n", mmc_hostname(card->host),
                                 1 << bus_width, ddr);
                         goto free_card;
@@ -1204,7 +1204,7 @@ int mmc_attach_mmc(struct mmc_host *host)
          * support.
          */
         if (ocr & 0x7F) {
-                printk(KERN_WARNING "%s: card claims to support voltages "
+                pr_warning("%s: card claims to support voltages "
                        "below the defined range. These will be ignored.\n",
                        mmc_hostname(host));
                 ocr &= ~0x7F;
@@ -1243,7 +1243,7 @@ remove_card:
 err:
         mmc_detach_bus(host);
 
-        printk(KERN_ERR "%s: error %d whilst initialising MMC card\n",
+        pr_err("%s: error %d whilst initialising MMC card\n",
                 mmc_hostname(host), err);
 
         return err;
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 7aa13d01a835..4e11d56b3f70 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -414,7 +414,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                         return -EBADMSG;
         } else {
                 if (status & 0xFDFFA000)
-                        printk(KERN_WARNING "%s: unexpected status %#x after "
+                        pr_warning("%s: unexpected status %#x after "
                                "switch", mmc_hostname(card->host), status);
                 if (status & R1_SWITCH_ERROR)
                         return -EBADMSG;
@@ -476,7 +476,7 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
         else if (len == 4)
                 test_buf = testdata_4bit;
         else {
-                printk(KERN_ERR "%s: Invalid bus_width %d\n",
+                pr_err("%s: Invalid bus_width %d\n",
                        mmc_hostname(host), len);
                 kfree(data_buf);
                 return -EINVAL;
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 342b18c4afcb..25b937294130 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -163,7 +163,7 @@ static int mmc_decode_csd(struct mmc_card *card)
                 csd->erase_size = 1;
                 break;
         default:
-                printk(KERN_ERR "%s: unrecognised CSD structure version %d\n",
+                pr_err("%s: unrecognised CSD structure version %d\n",
                         mmc_hostname(card->host), csd_struct);
                 return -EINVAL;
         }
@@ -187,7 +187,7 @@ static int mmc_decode_scr(struct mmc_card *card)
 
         scr_struct = UNSTUFF_BITS(resp, 60, 4);
         if (scr_struct != 0) {
-                printk(KERN_ERR "%s: unrecognised SCR structure version %d\n",
+                pr_err("%s: unrecognised SCR structure version %d\n",
                         mmc_hostname(card->host), scr_struct);
                 return -EINVAL;
         }
@@ -218,7 +218,7 @@ static int mmc_read_ssr(struct mmc_card *card)
         u32 *ssr;
 
         if (!(card->csd.cmdclass & CCC_APP_SPEC)) {
-                printk(KERN_WARNING "%s: card lacks mandatory SD Status "
+                pr_warning("%s: card lacks mandatory SD Status "
                         "function.\n", mmc_hostname(card->host));
                 return 0;
         }
@@ -229,7 +229,7 @@ static int mmc_read_ssr(struct mmc_card *card)
 
         err = mmc_app_sd_status(card, ssr);
         if (err) {
-                printk(KERN_WARNING "%s: problem reading SD Status "
+                pr_warning("%s: problem reading SD Status "
                         "register.\n", mmc_hostname(card->host));
                 err = 0;
                 goto out;
@@ -253,7 +253,7 @@ static int mmc_read_ssr(struct mmc_card *card)
                         card->ssr.erase_offset = eo * 1000;
                 }
         } else {
-                printk(KERN_WARNING "%s: SD Status: Invalid Allocation Unit "
+                pr_warning("%s: SD Status: Invalid Allocation Unit "
                         "size.\n", mmc_hostname(card->host));
         }
 out:
@@ -273,7 +273,7 @@ static int mmc_read_switch(struct mmc_card *card)
                 return 0;
 
         if (!(card->csd.cmdclass & CCC_SWITCH)) {
-                printk(KERN_WARNING "%s: card lacks mandatory switch "
+                pr_warning("%s: card lacks mandatory switch "
                         "function, performance might suffer.\n",
                         mmc_hostname(card->host));
                 return 0;
@@ -283,7 +283,7 @@ static int mmc_read_switch(struct mmc_card *card)
 
         status = kmalloc(64, GFP_KERNEL);
         if (!status) {
-                printk(KERN_ERR "%s: could not allocate a buffer for "
+                pr_err("%s: could not allocate a buffer for "
                         "switch capabilities.\n",
                         mmc_hostname(card->host));
                 return -ENOMEM;
@@ -299,7 +299,7 @@ static int mmc_read_switch(struct mmc_card *card)
                 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
                         goto out;
 
-                printk(KERN_WARNING "%s: problem reading Bus Speed modes.\n",
+                pr_warning("%s: problem reading Bus Speed modes.\n",
                         mmc_hostname(card->host));
                 err = 0;
 
@@ -319,7 +319,7 @@ static int mmc_read_switch(struct mmc_card *card)
                         if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
                                 goto out;
 
-                        printk(KERN_WARNING "%s: problem reading "
+                        pr_warning("%s: problem reading "
                                 "Driver Strength.\n",
                                 mmc_hostname(card->host));
                         err = 0;
@@ -339,7 +339,7 @@ static int mmc_read_switch(struct mmc_card *card)
                         if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
                                 goto out;
 
-                        printk(KERN_WARNING "%s: problem reading "
+                        pr_warning("%s: problem reading "
                                 "Current Limit.\n",
                                 mmc_hostname(card->host));
                         err = 0;
@@ -383,7 +383,7 @@ int mmc_sd_switch_hs(struct mmc_card *card)
 
         status = kmalloc(64, GFP_KERNEL);
         if (!status) {
-                printk(KERN_ERR "%s: could not allocate a buffer for "
+                pr_err("%s: could not allocate a buffer for "
                         "switch capabilities.\n", mmc_hostname(card->host));
                 return -ENOMEM;
         }
@@ -393,7 +393,7 @@ int mmc_sd_switch_hs(struct mmc_card *card)
                 goto out;
 
         if ((status[16] & 0xF) != 1) {
-                printk(KERN_WARNING "%s: Problem switching card "
+                pr_warning("%s: Problem switching card "
                         "into high-speed mode!\n",
                         mmc_hostname(card->host));
                 err = 0;
@@ -459,7 +459,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
                 return err;
 
         if ((status[15] & 0xF) != drive_strength) {
-                printk(KERN_WARNING "%s: Problem setting drive strength!\n",
+                pr_warning("%s: Problem setting drive strength!\n",
                         mmc_hostname(card->host));
                 return 0;
         }
@@ -538,7 +538,7 @@ static int sd_set_bus_speed_mode(struct mmc_card *card, u8 *status)
                 return err;
 
         if ((status[16] & 0xF) != card->sd_bus_speed)
-                printk(KERN_WARNING "%s: Problem setting bus speed mode!\n",
+                pr_warning("%s: Problem setting bus speed mode!\n",
                         mmc_hostname(card->host));
         else {
                 mmc_set_timing(card->host, timing);
@@ -600,7 +600,7 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status)
                 return err;
 
         if (((status[15] >> 4) & 0x0F) != current_limit)
-                printk(KERN_WARNING "%s: Problem setting current limit!\n",
+                pr_warning("%s: Problem setting current limit!\n",
                         mmc_hostname(card->host));
 
         return 0;
@@ -622,7 +622,7 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
 
         status = kmalloc(64, GFP_KERNEL);
         if (!status) {
-                printk(KERN_ERR "%s: could not allocate a buffer for "
+                pr_err("%s: could not allocate a buffer for "
                         "switch capabilities.\n", mmc_hostname(card->host));
                 return -ENOMEM;
         }
@@ -852,7 +852,7 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card,
                         ro = host->ops->get_ro(host);
 
                 if (ro < 0) {
-                        printk(KERN_WARNING "%s: host does not "
+                        pr_warning("%s: host does not "
                                 "support reading read-only "
                                 "switch. assuming write-enable.\n",
                                 mmc_hostname(host));
@@ -1166,7 +1166,7 @@ int mmc_attach_sd(struct mmc_host *host)
          * support.
          */
         if (ocr & 0x7F) {
-                printk(KERN_WARNING "%s: card claims to support voltages "
+                pr_warning("%s: card claims to support voltages "
                        "below the defined range. These will be ignored.\n",
                        mmc_hostname(host));
                 ocr &= ~0x7F;
@@ -1174,7 +1174,7 @@ int mmc_attach_sd(struct mmc_host *host)
 
         if ((ocr & MMC_VDD_165_195) &&
             !(host->ocr_avail_sd & MMC_VDD_165_195)) {
-                printk(KERN_WARNING "%s: SD card claims to support the "
+                pr_warning("%s: SD card claims to support the "
                        "incompletely defined 'low voltage range'. This "
                        "will be ignored.\n", mmc_hostname(host));
                 ocr &= ~MMC_VDD_165_195;
@@ -1213,7 +1213,7 @@ remove_card:
 err:
         mmc_detach_bus(host);
 
-        printk(KERN_ERR "%s: error %d whilst initialising SD card\n",
+        pr_err("%s: error %d whilst initialising SD card\n",
                 mmc_hostname(host), err);
 
         return err;
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 698d813cff3b..925bab052b07 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -112,7 +112,7 @@ static int sdio_read_cccr(struct mmc_card *card)
         cccr_vsn = data & 0x0f;
 
         if (cccr_vsn > SDIO_CCCR_REV_1_20) {
-                printk(KERN_ERR "%s: unrecognised CCCR structure version %d\n",
+                pr_err("%s: unrecognised CCCR structure version %d\n",
                         mmc_hostname(card->host), cccr_vsn);
                 return -EINVAL;
         }
@@ -777,7 +777,7 @@ int mmc_attach_sdio(struct mmc_host *host)
          * support.
          */
         if (ocr & 0x7F) {
-                printk(KERN_WARNING "%s: card claims to support voltages "
+                pr_warning("%s: card claims to support voltages "
                        "below the defined range. These will be ignored.\n",
                        mmc_hostname(host));
                 ocr &= ~0x7F;
@@ -874,7 +874,7 @@ remove:
 err:
         mmc_detach_bus(host);
 
-        printk(KERN_ERR "%s: error %d whilst initialising SDIO card\n",
+        pr_err("%s: error %d whilst initialising SDIO card\n",
                 mmc_hostname(host), err);
 
         return err;
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index e4e6822d09e3..c643b2f78bf1 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -173,7 +173,7 @@ static int sdio_bus_remove(struct device *dev)
         drv->remove(func);
 
         if (func->irq_handler) {
-                printk(KERN_WARNING "WARNING: driver %s did not remove "
+                pr_warning("WARNING: driver %s did not remove "
                         "its interrupt handler!\n", drv->name);
                 sdio_claim_host(func);
                 sdio_release_irq(func);
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index 541bdb89e0c5..f1c7ed8f4d85 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -132,7 +132,7 @@ static int cis_tpl_parse(struct mmc_card *card, struct sdio_func *func,
                         ret = -EINVAL;
                 }
                 if (ret && ret != -EILSEQ && ret != -ENOENT) {
-                        printk(KERN_ERR "%s: bad %s tuple 0x%02x (%u bytes)\n",
+                        pr_err("%s: bad %s tuple 0x%02x (%u bytes)\n",
                                mmc_hostname(card->host), tpl_descr, code, size);
                 }
         } else {
@@ -313,7 +313,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
 
                         if (ret == -ENOENT) {
                                 /* warn about unknown tuples */
-                                printk(KERN_WARNING "%s: queuing unknown"
+                                pr_warning("%s: queuing unknown"
                                        " CIS tuple 0x%02x (%u bytes)\n",
                                        mmc_hostname(card->host),
                                        tpl_code, tpl_link);
diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
index 03ead028d2ce..b644dd59c16e 100644
--- a/drivers/mmc/core/sdio_irq.c
+++ b/drivers/mmc/core/sdio_irq.c
@@ -45,7 +45,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
 
         ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending);
         if (ret) {
-                printk(KERN_DEBUG "%s: error %d reading SDIO_CCCR_INTx\n",
+                pr_debug("%s: error %d reading SDIO_CCCR_INTx\n",
                        mmc_card_id(card), ret);
                 return ret;
         }
@@ -55,7 +55,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
                 if (pending & (1 << i)) {
                         func = card->sdio_func[i - 1];
                         if (!func) {
-                                printk(KERN_WARNING "%s: pending IRQ for "
+                                pr_warning("%s: pending IRQ for "
                                         "non-existent function\n",
                                         mmc_card_id(card));
                                 ret = -EINVAL;
@@ -63,7 +63,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
                                 func->irq_handler(func);
                                 count++;
                         } else {
-                                printk(KERN_WARNING "%s: pending IRQ with no handler\n",
+                                pr_warning("%s: pending IRQ with no handler\n",
                                        sdio_func_id(func));
                                 ret = -EINVAL;
                         }