mmc: Convert pr_warning to pr_warn

Use the much more common pr_warn instead of pr_warning.

Other miscellanea:

o Coalesce formats
o Realign arguments
o Remove extra spaces when coalescing formats

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

3 files changed, 8 insertions, 11 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 5d2799730a32..1fa4c80ff886 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1928,8 +1928,8 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
                 case MMC_BLK_ECC_ERR:
                         if (brq->data.blocks > 1) {
                                 /* Redo read one sector at a time */
-                                pr_warning("%s: retrying using single block read\n",
-                                           req->rq_disk->disk_name);
+                                pr_warn("%s: retrying using single block read\n",
+                                        req->rq_disk->disk_name);
                                 disable_multi = 1;
                                 break;
                         }
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 3e049c13429c..feea926e32f8 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -229,14 +229,12 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
                 if (bouncesz > 512) {
                         mqrq_cur->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);
                         if (!mqrq_cur->bounce_buf) {
-                                pr_warning("%s: unable to "
-                                        "allocate bounce cur buffer\n",
+                                pr_warn("%s: unable to allocate bounce cur buffer\n",
                                         mmc_card_name(card));
                         }
                         mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);
                         if (!mqrq_prev->bounce_buf) {
-                                pr_warning("%s: unable to "
-                                        "allocate bounce prev buffer\n",
+                                pr_warn("%s: unable to allocate bounce prev buffer\n",
                                         mmc_card_name(card));
                                 kfree(mqrq_cur->bounce_buf);
                                 mqrq_cur->bounce_buf = NULL;
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index f093cea0d060..d2de5925b73e 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -1063,8 +1063,8 @@ static int sdio_uart_probe(struct sdio_func *func,
                 return -ENOMEM;
 
         if (func->class == SDIO_CLASS_UART) {
-                pr_warning("%s: need info on UART class basic setup\n",
-                       sdio_func_id(func));
+                pr_warn("%s: need info on UART class basic setup\n",
+                        sdio_func_id(func));
                 kfree(port);
                 return -ENOSYS;
         } else if (func->class == SDIO_CLASS_GPS) {
@@ -1082,9 +1082,8 @@ static int sdio_uart_probe(struct sdio_func *func,
                                 break;
                 }
                 if (!tpl) {
-                        pr_warning(
-       "%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",
-                               sdio_func_id(func));
+                        pr_warn("%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",
+                                sdio_func_id(func));
                         kfree(port);
                         return -EINVAL;
                 }