aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGirish K S <girish.shivananjappa@linaro.org>2011-10-11 02:14:09 -0400
committerChris Ball <cjb@laptop.org>2011-10-26 16:32:22 -0400
commita3c76eb9d4a1e68a69dd880cf0bcb8a52418b993 (patch)
tree968fb0009edad3defcda8bb40df21837868705dd /drivers
parentb23cf0bd55b0c6b703982446f679e00d6d929524 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/card/block.c10
-rw-r--r--drivers/mmc/card/mmc_test.c34
-rw-r--r--drivers/mmc/card/queue.c4
-rw-r--r--drivers/mmc/card/sdio_uart.c10
-rw-r--r--drivers/mmc/core/bus.c6
-rw-r--r--drivers/mmc/core/core.c10
-rw-r--r--drivers/mmc/core/mmc.c24
-rw-r--r--drivers/mmc/core/mmc_ops.c4
-rw-r--r--drivers/mmc/core/sd.c40
-rw-r--r--drivers/mmc/core/sdio.c6
-rw-r--r--drivers/mmc/core/sdio_bus.c2
-rw-r--r--drivers/mmc/core/sdio_cis.c4
-rw-r--r--drivers/mmc/core/sdio_irq.c6
-rw-r--r--drivers/mmc/host/au1xmmc.c10
-rw-r--r--drivers/mmc/host/dw_mmc.c2
-rw-r--r--drivers/mmc/host/imxmmc.c2
-rw-r--r--drivers/mmc/host/mmci.c2
-rw-r--r--drivers/mmc/host/msm_sdcc.c8
-rw-r--r--drivers/mmc/host/mvsdio.c14
-rw-r--r--drivers/mmc/host/mxcmmc.c2
-rw-r--r--drivers/mmc/host/omap_hsmmc.c6
-rw-r--r--drivers/mmc/host/pxamci.c2
-rw-r--r--drivers/mmc/host/s3cmci.c4
-rw-r--r--drivers/mmc/host/sdhci.c92
-rw-r--r--drivers/mmc/host/tifm_sd.c18
-rw-r--r--drivers/mmc/host/tmio_mmc_pio.c2
-rw-r--r--drivers/mmc/host/via-sdmmc.c2
-rw-r--r--drivers/mmc/host/wbsd.c22
28 files changed, 172 insertions, 176 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 2cf1ba6db910..049445eb4f74 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -937,7 +937,7 @@ static int mmc_blk_err_check(struct mmc_card *card,
937 do { 937 do {
938 int err = get_card_status(card, &status, 5); 938 int err = get_card_status(card, &status, 5);
939 if (err) { 939 if (err) {
940 printk(KERN_ERR "%s: error %d requesting status\n", 940 pr_err("%s: error %d requesting status\n",
941 req->rq_disk->disk_name, err); 941 req->rq_disk->disk_name, err);
942 return MMC_BLK_CMD_ERR; 942 return MMC_BLK_CMD_ERR;
943 } 943 }
@@ -1187,7 +1187,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
1187 * were returned by the host controller, it's a bug. 1187 * were returned by the host controller, it's a bug.
1188 */ 1188 */
1189 if (status == MMC_BLK_SUCCESS && ret) { 1189 if (status == MMC_BLK_SUCCESS && ret) {
1190 printk(KERN_ERR "%s BUG rq_tot %d d_xfer %d\n", 1190 pr_err("%s BUG rq_tot %d d_xfer %d\n",
1191 __func__, blk_rq_bytes(req), 1191 __func__, blk_rq_bytes(req),
1192 brq->data.bytes_xfered); 1192 brq->data.bytes_xfered);
1193 rqc = NULL; 1193 rqc = NULL;
@@ -1467,7 +1467,7 @@ static int mmc_blk_alloc_part(struct mmc_card *card,
1467 1467
1468 string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2, 1468 string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2,
1469 cap_str, sizeof(cap_str)); 1469 cap_str, sizeof(cap_str));
1470 printk(KERN_INFO "%s: %s %s partition %u %s\n", 1470 pr_info("%s: %s %s partition %u %s\n",
1471 part_md->disk->disk_name, mmc_card_id(card), 1471 part_md->disk->disk_name, mmc_card_id(card),
1472 mmc_card_name(card), part_md->part_type, cap_str); 1472 mmc_card_name(card), part_md->part_type, cap_str);
1473 return 0; 1473 return 0;
@@ -1511,7 +1511,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
1511 mmc_release_host(card->host); 1511 mmc_release_host(card->host);
1512 1512
1513 if (err) { 1513 if (err) {
1514 printk(KERN_ERR "%s: unable to set block size to 512: %d\n", 1514 pr_err("%s: unable to set block size to 512: %d\n",
1515 md->disk->disk_name, err); 1515 md->disk->disk_name, err);
1516 return -EINVAL; 1516 return -EINVAL;
1517 } 1517 }
@@ -1613,7 +1613,7 @@ static int mmc_blk_probe(struct mmc_card *card)
1613 1613
1614 string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2, 1614 string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2,
1615 cap_str, sizeof(cap_str)); 1615 cap_str, sizeof(cap_str));
1616 printk(KERN_INFO "%s: %s %s %s %s\n", 1616 pr_info("%s: %s %s %s %s\n",
1617 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), 1617 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
1618 cap_str, md->read_only ? "(ro)" : ""); 1618 cap_str, md->read_only ? "(ro)" : "");
1619 1619
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index d8705add3c98..b038c4a9468b 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -251,7 +251,7 @@ static int mmc_test_wait_busy(struct mmc_test_card *test)
251 if (!busy && mmc_test_busy(&cmd)) { 251 if (!busy && mmc_test_busy(&cmd)) {
252 busy = 1; 252 busy = 1;
253 if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY) 253 if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
254 printk(KERN_INFO "%s: Warning: Host did not " 254 pr_info("%s: Warning: Host did not "
255 "wait for busy state to end.\n", 255 "wait for busy state to end.\n",
256 mmc_hostname(test->card->host)); 256 mmc_hostname(test->card->host));
257 } 257 }
@@ -553,7 +553,7 @@ static void mmc_test_print_rate(struct mmc_test_card *test, uint64_t bytes,
553 rate = mmc_test_rate(bytes, &ts); 553 rate = mmc_test_rate(bytes, &ts);
554 iops = mmc_test_rate(100, &ts); /* I/O ops per sec x 100 */ 554 iops = mmc_test_rate(100, &ts); /* I/O ops per sec x 100 */
555 555
556 printk(KERN_INFO "%s: Transfer of %u sectors (%u%s KiB) took %lu.%09lu " 556 pr_info("%s: Transfer of %u sectors (%u%s KiB) took %lu.%09lu "
557 "seconds (%u kB/s, %u KiB/s, %u.%02u IOPS)\n", 557 "seconds (%u kB/s, %u KiB/s, %u.%02u IOPS)\n",
558 mmc_hostname(test->card->host), sectors, sectors >> 1, 558 mmc_hostname(test->card->host), sectors, sectors >> 1,
559 (sectors & 1 ? ".5" : ""), (unsigned long)ts.tv_sec, 559 (sectors & 1 ? ".5" : ""), (unsigned long)ts.tv_sec,
@@ -579,7 +579,7 @@ static void mmc_test_print_avg_rate(struct mmc_test_card *test, uint64_t bytes,
579 rate = mmc_test_rate(tot, &ts); 579 rate = mmc_test_rate(tot, &ts);
580 iops = mmc_test_rate(count * 100, &ts); /* I/O ops per sec x 100 */ 580 iops = mmc_test_rate(count * 100, &ts); /* I/O ops per sec x 100 */
581 581
582 printk(KERN_INFO "%s: Transfer of %u x %u sectors (%u x %u%s KiB) took " 582 pr_info("%s: Transfer of %u x %u sectors (%u x %u%s KiB) took "
583 "%lu.%09lu seconds (%u kB/s, %u KiB/s, " 583 "%lu.%09lu seconds (%u kB/s, %u KiB/s, "
584 "%u.%02u IOPS, sg_len %d)\n", 584 "%u.%02u IOPS, sg_len %d)\n",
585 mmc_hostname(test->card->host), count, sectors, count, 585 mmc_hostname(test->card->host), count, sectors, count,
@@ -1409,7 +1409,7 @@ static int mmc_test_multi_read_high(struct mmc_test_card *test)
1409 1409
1410static int mmc_test_no_highmem(struct mmc_test_card *test) 1410static int mmc_test_no_highmem(struct mmc_test_card *test)
1411{ 1411{
1412 printk(KERN_INFO "%s: Highmem not configured - test skipped\n", 1412 pr_info("%s: Highmem not configured - test skipped\n",
1413 mmc_hostname(test->card->host)); 1413 mmc_hostname(test->card->host));
1414 return 0; 1414 return 0;
1415} 1415}
@@ -1436,7 +1436,7 @@ static int mmc_test_area_map(struct mmc_test_card *test, unsigned long sz,
1436 t->max_seg_sz, &t->sg_len, min_sg_len); 1436 t->max_seg_sz, &t->sg_len, min_sg_len);
1437 } 1437 }
1438 if (err) 1438 if (err)
1439 printk(KERN_INFO "%s: Failed to map sg list\n", 1439 pr_info("%s: Failed to map sg list\n",
1440 mmc_hostname(test->card->host)); 1440 mmc_hostname(test->card->host));
1441 return err; 1441 return err;
1442} 1442}
@@ -2136,7 +2136,7 @@ static int mmc_test_rw_multiple(struct mmc_test_card *test,
2136 2136
2137 return ret; 2137 return ret;
2138 err: 2138 err:
2139 printk(KERN_INFO "[%s] error\n", __func__); 2139 pr_info("[%s] error\n", __func__);
2140 return ret; 2140 return ret;
2141} 2141}
2142 2142
@@ -2150,7 +2150,7 @@ static int mmc_test_rw_multiple_size(struct mmc_test_card *test,
2150 2150
2151 if (rw->do_nonblock_req && 2151 if (rw->do_nonblock_req &&
2152 ((!pre_req && post_req) || (pre_req && !post_req))) { 2152 ((!pre_req && post_req) || (pre_req && !post_req))) {
2153 printk(KERN_INFO "error: only one of pre/post is defined\n"); 2153 pr_info("error: only one of pre/post is defined\n");
2154 return -EINVAL; 2154 return -EINVAL;
2155 } 2155 }
2156 2156
@@ -2691,7 +2691,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
2691{ 2691{
2692 int i, ret; 2692 int i, ret;
2693 2693
2694 printk(KERN_INFO "%s: Starting tests of card %s...\n", 2694 pr_info("%s: Starting tests of card %s...\n",
2695 mmc_hostname(test->card->host), mmc_card_id(test->card)); 2695 mmc_hostname(test->card->host), mmc_card_id(test->card));
2696 2696
2697 mmc_claim_host(test->card->host); 2697 mmc_claim_host(test->card->host);
@@ -2702,14 +2702,14 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
2702 if (testcase && ((i + 1) != testcase)) 2702 if (testcase && ((i + 1) != testcase))
2703 continue; 2703 continue;
2704 2704
2705 printk(KERN_INFO "%s: Test case %d. %s...\n", 2705 pr_info("%s: Test case %d. %s...\n",
2706 mmc_hostname(test->card->host), i + 1, 2706 mmc_hostname(test->card->host), i + 1,
2707 mmc_test_cases[i].name); 2707 mmc_test_cases[i].name);
2708 2708
2709 if (mmc_test_cases[i].prepare) { 2709 if (mmc_test_cases[i].prepare) {
2710 ret = mmc_test_cases[i].prepare(test); 2710 ret = mmc_test_cases[i].prepare(test);
2711 if (ret) { 2711 if (ret) {
2712 printk(KERN_INFO "%s: Result: Prepare " 2712 pr_info("%s: Result: Prepare "
2713 "stage failed! (%d)\n", 2713 "stage failed! (%d)\n",
2714 mmc_hostname(test->card->host), 2714 mmc_hostname(test->card->host),
2715 ret); 2715 ret);
@@ -2739,25 +2739,25 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
2739 ret = mmc_test_cases[i].run(test); 2739 ret = mmc_test_cases[i].run(test);
2740 switch (ret) { 2740 switch (ret) {
2741 case RESULT_OK: 2741 case RESULT_OK:
2742 printk(KERN_INFO "%s: Result: OK\n", 2742 pr_info("%s: Result: OK\n",
2743 mmc_hostname(test->card->host)); 2743 mmc_hostname(test->card->host));
2744 break; 2744 break;
2745 case RESULT_FAIL: 2745 case RESULT_FAIL:
2746 printk(KERN_INFO "%s: Result: FAILED\n", 2746 pr_info("%s: Result: FAILED\n",
2747 mmc_hostname(test->card->host)); 2747 mmc_hostname(test->card->host));
2748 break; 2748 break;
2749 case RESULT_UNSUP_HOST: 2749 case RESULT_UNSUP_HOST:
2750 printk(KERN_INFO "%s: Result: UNSUPPORTED " 2750 pr_info("%s: Result: UNSUPPORTED "
2751 "(by host)\n", 2751 "(by host)\n",
2752 mmc_hostname(test->card->host)); 2752 mmc_hostname(test->card->host));
2753 break; 2753 break;
2754 case RESULT_UNSUP_CARD: 2754 case RESULT_UNSUP_CARD:
2755 printk(KERN_INFO "%s: Result: UNSUPPORTED " 2755 pr_info("%s: Result: UNSUPPORTED "
2756 "(by card)\n", 2756 "(by card)\n",
2757 mmc_hostname(test->card->host)); 2757 mmc_hostname(test->card->host));
2758 break; 2758 break;
2759 default: 2759 default:
2760 printk(KERN_INFO "%s: Result: ERROR (%d)\n", 2760 pr_info("%s: Result: ERROR (%d)\n",
2761 mmc_hostname(test->card->host), ret); 2761 mmc_hostname(test->card->host), ret);
2762 } 2762 }
2763 2763
@@ -2768,7 +2768,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
2768 if (mmc_test_cases[i].cleanup) { 2768 if (mmc_test_cases[i].cleanup) {
2769 ret = mmc_test_cases[i].cleanup(test); 2769 ret = mmc_test_cases[i].cleanup(test);
2770 if (ret) { 2770 if (ret) {
2771 printk(KERN_INFO "%s: Warning: Cleanup " 2771 pr_info("%s: Warning: Cleanup "
2772 "stage failed! (%d)\n", 2772 "stage failed! (%d)\n",
2773 mmc_hostname(test->card->host), 2773 mmc_hostname(test->card->host),
2774 ret); 2774 ret);
@@ -2778,7 +2778,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
2778 2778
2779 mmc_release_host(test->card->host); 2779 mmc_release_host(test->card->host);
2780 2780
2781 printk(KERN_INFO "%s: Tests completed.\n", 2781 pr_info("%s: Tests completed.\n",
2782 mmc_hostname(test->card->host)); 2782 mmc_hostname(test->card->host));
2783} 2783}
2784 2784
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 5196312bb55e..fed290ecc242 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -197,13 +197,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
197 if (bouncesz > 512) { 197 if (bouncesz > 512) {
198 mqrq_cur->bounce_buf = kmalloc(bouncesz, GFP_KERNEL); 198 mqrq_cur->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);
199 if (!mqrq_cur->bounce_buf) { 199 if (!mqrq_cur->bounce_buf) {
200 printk(KERN_WARNING "%s: unable to " 200 pr_warning("%s: unable to "
201 "allocate bounce cur buffer\n", 201 "allocate bounce cur buffer\n",
202 mmc_card_name(card)); 202 mmc_card_name(card));
203 } 203 }
204 mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL); 204 mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);
205 if (!mqrq_prev->bounce_buf) { 205 if (!mqrq_prev->bounce_buf) {
206 printk(KERN_WARNING "%s: unable to " 206 pr_warning("%s: unable to "
207 "allocate bounce prev buffer\n", 207 "allocate bounce prev buffer\n",
208 mmc_card_name(card)); 208 mmc_card_name(card));
209 kfree(mqrq_cur->bounce_buf); 209 kfree(mqrq_cur->bounce_buf);
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index c8c9edb3d7cb..2c151e18c9e8 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -1082,7 +1082,7 @@ static int sdio_uart_probe(struct sdio_func *func,
1082 return -ENOMEM; 1082 return -ENOMEM;
1083 1083
1084 if (func->class == SDIO_CLASS_UART) { 1084 if (func->class == SDIO_CLASS_UART) {
1085 printk(KERN_WARNING "%s: need info on UART class basic setup\n", 1085 pr_warning("%s: need info on UART class basic setup\n",
1086 sdio_func_id(func)); 1086 sdio_func_id(func));
1087 kfree(port); 1087 kfree(port);
1088 return -ENOSYS; 1088 return -ENOSYS;
@@ -1101,23 +1101,23 @@ static int sdio_uart_probe(struct sdio_func *func,
1101 break; 1101 break;
1102 } 1102 }
1103 if (!tpl) { 1103 if (!tpl) {
1104 printk(KERN_WARNING 1104 pr_warning(
1105 "%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n", 1105 "%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",
1106 sdio_func_id(func)); 1106 sdio_func_id(func));
1107 kfree(port); 1107 kfree(port);
1108 return -EINVAL; 1108 return -EINVAL;
1109 } 1109 }
1110 printk(KERN_DEBUG "%s: Register ID = 0x%02x, Exp ID = 0x%02x\n", 1110 pr_debug("%s: Register ID = 0x%02x, Exp ID = 0x%02x\n",
1111 sdio_func_id(func), tpl->data[2], tpl->data[3]); 1111 sdio_func_id(func), tpl->data[2], tpl->data[3]);
1112 port->regs_offset = (tpl->data[4] << 0) | 1112 port->regs_offset = (tpl->data[4] << 0) |
1113 (tpl->data[5] << 8) | 1113 (tpl->data[5] << 8) |
1114 (tpl->data[6] << 16); 1114 (tpl->data[6] << 16);
1115 printk(KERN_DEBUG "%s: regs offset = 0x%x\n", 1115 pr_debug("%s: regs offset = 0x%x\n",
1116 sdio_func_id(func), port->regs_offset); 1116 sdio_func_id(func), port->regs_offset);
1117 port->uartclk = tpl->data[7] * 115200; 1117 port->uartclk = tpl->data[7] * 115200;
1118 if (port->uartclk == 0) 1118 if (port->uartclk == 0)
1119 port->uartclk = 115200; 1119 port->uartclk = 115200;
1120 printk(KERN_DEBUG "%s: clk %d baudcode %u 4800-div %u\n", 1120 pr_debug("%s: clk %d baudcode %u 4800-div %u\n",
1121 sdio_func_id(func), port->uartclk, 1121 sdio_func_id(func), port->uartclk,
1122 tpl->data[7], tpl->data[8] | (tpl->data[9] << 8)); 1122 tpl->data[7], tpl->data[8] | (tpl->data[9] << 8));
1123 } else { 1123 } else {
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)
295 } 295 }
296 296
297 if (mmc_host_is_spi(card->host)) { 297 if (mmc_host_is_spi(card->host)) {
298 printk(KERN_INFO "%s: new %s%s%s card on SPI\n", 298 pr_info("%s: new %s%s%s card on SPI\n",
299 mmc_hostname(card->host), 299 mmc_hostname(card->host),
300 mmc_card_highspeed(card) ? "high speed " : "", 300 mmc_card_highspeed(card) ? "high speed " : "",
301 mmc_card_ddr_mode(card) ? "DDR " : "", 301 mmc_card_ddr_mode(card) ? "DDR " : "",
@@ -334,10 +334,10 @@ void mmc_remove_card(struct mmc_card *card)
334 334
335 if (mmc_card_present(card)) { 335 if (mmc_card_present(card)) {
336 if (mmc_host_is_spi(card->host)) { 336 if (mmc_host_is_spi(card->host)) {
337 printk(KERN_INFO "%s: SPI card removed\n", 337 pr_info("%s: SPI card removed\n",
338 mmc_hostname(card->host)); 338 mmc_hostname(card->host));
339 } else { 339 } else {
340 printk(KERN_INFO "%s: card %04x removed\n", 340 pr_info("%s: card %04x removed\n",
341 mmc_hostname(card->host), card->rca); 341 mmc_hostname(card->host), card->rca);
342 } 342 }
343 device_del(&card->dev); 343 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,
1541 cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; 1541 cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
1542 err = mmc_wait_for_cmd(card->host, &cmd, 0); 1542 err = mmc_wait_for_cmd(card->host, &cmd, 0);
1543 if (err) { 1543 if (err) {
1544 printk(KERN_ERR "mmc_erase: group start error %d, " 1544 pr_err("mmc_erase: group start error %d, "
1545 "status %#x\n", err, cmd.resp[0]); 1545 "status %#x\n", err, cmd.resp[0]);
1546 err = -EIO; 1546 err = -EIO;
1547 goto out; 1547 goto out;
@@ -1556,7 +1556,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
1556 cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; 1556 cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
1557 err = mmc_wait_for_cmd(card->host, &cmd, 0); 1557 err = mmc_wait_for_cmd(card->host, &cmd, 0);
1558 if (err) { 1558 if (err) {
1559 printk(KERN_ERR "mmc_erase: group end error %d, status %#x\n", 1559 pr_err("mmc_erase: group end error %d, status %#x\n",
1560 err, cmd.resp[0]); 1560 err, cmd.resp[0]);
1561 err = -EIO; 1561 err = -EIO;
1562 goto out; 1562 goto out;
@@ -1569,7 +1569,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
1569 cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty); 1569 cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty);
1570 err = mmc_wait_for_cmd(card->host, &cmd, 0); 1570 err = mmc_wait_for_cmd(card->host, &cmd, 0);
1571 if (err) { 1571 if (err) {
1572 printk(KERN_ERR "mmc_erase: erase error %d, status %#x\n", 1572 pr_err("mmc_erase: erase error %d, status %#x\n",
1573 err, cmd.resp[0]); 1573 err, cmd.resp[0]);
1574 err = -EIO; 1574 err = -EIO;
1575 goto out; 1575 goto out;
@@ -1586,7 +1586,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
1586 /* Do not retry else we can't see errors */ 1586 /* Do not retry else we can't see errors */
1587 err = mmc_wait_for_cmd(card->host, &cmd, 0); 1587 err = mmc_wait_for_cmd(card->host, &cmd, 0);
1588 if (err || (cmd.resp[0] & 0xFDF92000)) { 1588 if (err || (cmd.resp[0] & 0xFDF92000)) {
1589 printk(KERN_ERR "error %d requesting status %#x\n", 1589 pr_err("error %d requesting status %#x\n",
1590 err, cmd.resp[0]); 1590 err, cmd.resp[0]);
1591 err = -EIO; 1591 err = -EIO;
1592 goto out; 1592 goto out;
@@ -2177,7 +2177,7 @@ int mmc_resume_host(struct mmc_host *host)
2177 BUG_ON(!host->bus_ops->resume); 2177 BUG_ON(!host->bus_ops->resume);
2178 err = host->bus_ops->resume(host); 2178 err = host->bus_ops->resume(host);
2179 if (err) { 2179 if (err) {
2180 printk(KERN_WARNING "%s: error %d during resume " 2180 pr_warning("%s: error %d during resume "
2181 "(card was removed?)\n", 2181 "(card was removed?)\n",
2182 mmc_hostname(host), err); 2182 mmc_hostname(host), err);
2183 err = 0; 2183 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)
101 break; 101 break;
102 102
103 default: 103 default:
104 printk(KERN_ERR "%s: card has unknown MMCA version %d\n", 104 pr_err("%s: card has unknown MMCA version %d\n",
105 mmc_hostname(card->host), card->csd.mmca_vsn); 105 mmc_hostname(card->host), card->csd.mmca_vsn);
106 return -EINVAL; 106 return -EINVAL;
107 } 107 }
@@ -135,7 +135,7 @@ static int mmc_decode_csd(struct mmc_card *card)
135 */ 135 */
136 csd->structure = UNSTUFF_BITS(resp, 126, 2); 136 csd->structure = UNSTUFF_BITS(resp, 126, 2);
137 if (csd->structure == 0) { 137 if (csd->structure == 0) {
138 printk(KERN_ERR "%s: unrecognised CSD structure version %d\n", 138 pr_err("%s: unrecognised CSD structure version %d\n",
139 mmc_hostname(card->host), csd->structure); 139 mmc_hostname(card->host), csd->structure);
140 return -EINVAL; 140 return -EINVAL;
141 } 141 }
@@ -195,7 +195,7 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
195 */ 195 */
196 ext_csd = kmalloc(512, GFP_KERNEL); 196 ext_csd = kmalloc(512, GFP_KERNEL);
197 if (!ext_csd) { 197 if (!ext_csd) {
198 printk(KERN_ERR "%s: could not allocate a buffer to " 198 pr_err("%s: could not allocate a buffer to "
199 "receive the ext_csd.\n", mmc_hostname(card->host)); 199 "receive the ext_csd.\n", mmc_hostname(card->host));
200 return -ENOMEM; 200 return -ENOMEM;
201 } 201 }
@@ -217,12 +217,12 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
217 * stored in their CSD. 217 * stored in their CSD.
218 */ 218 */
219 if (card->csd.capacity == (4096 * 512)) { 219 if (card->csd.capacity == (4096 * 512)) {
220 printk(KERN_ERR "%s: unable to read EXT_CSD " 220 pr_err("%s: unable to read EXT_CSD "
221 "on a possible high capacity card. " 221 "on a possible high capacity card. "
222 "Card will be ignored.\n", 222 "Card will be ignored.\n",
223 mmc_hostname(card->host)); 223 mmc_hostname(card->host));
224 } else { 224 } else {
225 printk(KERN_WARNING "%s: unable to read " 225 pr_warning("%s: unable to read "
226 "EXT_CSD, performance might " 226 "EXT_CSD, performance might "
227 "suffer.\n", 227 "suffer.\n",
228 mmc_hostname(card->host)); 228 mmc_hostname(card->host));
@@ -252,7 +252,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
252 card->ext_csd.raw_ext_csd_structure = ext_csd[EXT_CSD_STRUCTURE]; 252 card->ext_csd.raw_ext_csd_structure = ext_csd[EXT_CSD_STRUCTURE];
253 if (card->csd.structure == 3) { 253 if (card->csd.structure == 3) {
254 if (card->ext_csd.raw_ext_csd_structure > 2) { 254 if (card->ext_csd.raw_ext_csd_structure > 2) {
255 printk(KERN_ERR "%s: unrecognised EXT_CSD structure " 255 pr_err("%s: unrecognised EXT_CSD structure "
256 "version %d\n", mmc_hostname(card->host), 256 "version %d\n", mmc_hostname(card->host),
257 card->ext_csd.raw_ext_csd_structure); 257 card->ext_csd.raw_ext_csd_structure);
258 err = -EINVAL; 258 err = -EINVAL;
@@ -262,7 +262,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
262 262
263 card->ext_csd.rev = ext_csd[EXT_CSD_REV]; 263 card->ext_csd.rev = ext_csd[EXT_CSD_REV];
264 if (card->ext_csd.rev > 6) { 264 if (card->ext_csd.rev > 6) {
265 printk(KERN_ERR "%s: unrecognised EXT_CSD revision %d\n", 265 pr_err("%s: unrecognised EXT_CSD revision %d\n",
266 mmc_hostname(card->host), card->ext_csd.rev); 266 mmc_hostname(card->host), card->ext_csd.rev);
267 err = -EINVAL; 267 err = -EINVAL;
268 goto out; 268 goto out;
@@ -308,7 +308,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
308 break; 308 break;
309 default: 309 default:
310 /* MMC v4 spec says this cannot happen */ 310 /* MMC v4 spec says this cannot happen */
311 printk(KERN_WARNING "%s: card is mmc v4 but doesn't " 311 pr_warning("%s: card is mmc v4 but doesn't "
312 "support any high-speed modes.\n", 312 "support any high-speed modes.\n",
313 mmc_hostname(card->host)); 313 mmc_hostname(card->host));
314 } 314 }
@@ -857,7 +857,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
857 goto free_card; 857 goto free_card;
858 858
859 if (err) { 859 if (err) {
860 printk(KERN_WARNING "%s: switch to highspeed failed\n", 860 pr_warning("%s: switch to highspeed failed\n",
861 mmc_hostname(card->host)); 861 mmc_hostname(card->host));
862 err = 0; 862 err = 0;
863 } else { 863 } else {
@@ -966,7 +966,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
966 card->ext_csd.generic_cmd6_time); 966 card->ext_csd.generic_cmd6_time);
967 } 967 }
968 if (err) { 968 if (err) {
969 printk(KERN_WARNING "%s: switch to bus width %d ddr %d " 969 pr_warning("%s: switch to bus width %d ddr %d "
970 "failed\n", mmc_hostname(card->host), 970 "failed\n", mmc_hostname(card->host),
971 1 << bus_width, ddr); 971 1 << bus_width, ddr);
972 goto free_card; 972 goto free_card;
@@ -1204,7 +1204,7 @@ int mmc_attach_mmc(struct mmc_host *host)
1204 * support. 1204 * support.
1205 */ 1205 */
1206 if (ocr & 0x7F) { 1206 if (ocr & 0x7F) {
1207 printk(KERN_WARNING "%s: card claims to support voltages " 1207 pr_warning("%s: card claims to support voltages "
1208 "below the defined range. These will be ignored.\n", 1208 "below the defined range. These will be ignored.\n",
1209 mmc_hostname(host)); 1209 mmc_hostname(host));
1210 ocr &= ~0x7F; 1210 ocr &= ~0x7F;
@@ -1243,7 +1243,7 @@ remove_card:
1243err: 1243err:
1244 mmc_detach_bus(host); 1244 mmc_detach_bus(host);
1245 1245
1246 printk(KERN_ERR "%s: error %d whilst initialising MMC card\n", 1246 pr_err("%s: error %d whilst initialising MMC card\n",
1247 mmc_hostname(host), err); 1247 mmc_hostname(host), err);
1248 1248
1249 return err; 1249 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,
414 return -EBADMSG; 414 return -EBADMSG;
415 } else { 415 } else {
416 if (status & 0xFDFFA000) 416 if (status & 0xFDFFA000)
417 printk(KERN_WARNING "%s: unexpected status %#x after " 417 pr_warning("%s: unexpected status %#x after "
418 "switch", mmc_hostname(card->host), status); 418 "switch", mmc_hostname(card->host), status);
419 if (status & R1_SWITCH_ERROR) 419 if (status & R1_SWITCH_ERROR)
420 return -EBADMSG; 420 return -EBADMSG;
@@ -476,7 +476,7 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
476 else if (len == 4) 476 else if (len == 4)
477 test_buf = testdata_4bit; 477 test_buf = testdata_4bit;
478 else { 478 else {
479 printk(KERN_ERR "%s: Invalid bus_width %d\n", 479 pr_err("%s: Invalid bus_width %d\n",
480 mmc_hostname(host), len); 480 mmc_hostname(host), len);
481 kfree(data_buf); 481 kfree(data_buf);
482 return -EINVAL; 482 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)
163 csd->erase_size = 1; 163 csd->erase_size = 1;
164 break; 164 break;
165 default: 165 default:
166 printk(KERN_ERR "%s: unrecognised CSD structure version %d\n", 166 pr_err("%s: unrecognised CSD structure version %d\n",
167 mmc_hostname(card->host), csd_struct); 167 mmc_hostname(card->host), csd_struct);
168 return -EINVAL; 168 return -EINVAL;
169 } 169 }
@@ -187,7 +187,7 @@ static int mmc_decode_scr(struct mmc_card *card)
187 187
188 scr_struct = UNSTUFF_BITS(resp, 60, 4); 188 scr_struct = UNSTUFF_BITS(resp, 60, 4);
189 if (scr_struct != 0) { 189 if (scr_struct != 0) {
190 printk(KERN_ERR "%s: unrecognised SCR structure version %d\n", 190 pr_err("%s: unrecognised SCR structure version %d\n",
191 mmc_hostname(card->host), scr_struct); 191 mmc_hostname(card->host), scr_struct);
192 return -EINVAL; 192 return -EINVAL;
193 } 193 }
@@ -218,7 +218,7 @@ static int mmc_read_ssr(struct mmc_card *card)
218 u32 *ssr; 218 u32 *ssr;
219 219
220 if (!(card->csd.cmdclass & CCC_APP_SPEC)) { 220 if (!(card->csd.cmdclass & CCC_APP_SPEC)) {
221 printk(KERN_WARNING "%s: card lacks mandatory SD Status " 221 pr_warning("%s: card lacks mandatory SD Status "
222 "function.\n", mmc_hostname(card->host)); 222 "function.\n", mmc_hostname(card->host));
223 return 0; 223 return 0;
224 } 224 }
@@ -229,7 +229,7 @@ static int mmc_read_ssr(struct mmc_card *card)
229 229
230 err = mmc_app_sd_status(card, ssr); 230 err = mmc_app_sd_status(card, ssr);
231 if (err) { 231 if (err) {
232 printk(KERN_WARNING "%s: problem reading SD Status " 232 pr_warning("%s: problem reading SD Status "
233 "register.\n", mmc_hostname(card->host)); 233 "register.\n", mmc_hostname(card->host));
234 err = 0; 234 err = 0;
235 goto out; 235 goto out;
@@ -253,7 +253,7 @@ static int mmc_read_ssr(struct mmc_card *card)
253 card->ssr.erase_offset = eo * 1000; 253 card->ssr.erase_offset = eo * 1000;
254 } 254 }
255 } else { 255 } else {
256 printk(KERN_WARNING "%s: SD Status: Invalid Allocation Unit " 256 pr_warning("%s: SD Status: Invalid Allocation Unit "
257 "size.\n", mmc_hostname(card->host)); 257 "size.\n", mmc_hostname(card->host));
258 } 258 }
259out: 259out:
@@ -273,7 +273,7 @@ static int mmc_read_switch(struct mmc_card *card)
273 return 0; 273 return 0;
274 274
275 if (!(card->csd.cmdclass & CCC_SWITCH)) { 275 if (!(card->csd.cmdclass & CCC_SWITCH)) {
276 printk(KERN_WARNING "%s: card lacks mandatory switch " 276 pr_warning("%s: card lacks mandatory switch "
277 "function, performance might suffer.\n", 277 "function, performance might suffer.\n",
278 mmc_hostname(card->host)); 278 mmc_hostname(card->host));
279 return 0; 279 return 0;
@@ -283,7 +283,7 @@ static int mmc_read_switch(struct mmc_card *card)
283 283
284 status = kmalloc(64, GFP_KERNEL); 284 status = kmalloc(64, GFP_KERNEL);
285 if (!status) { 285 if (!status) {
286 printk(KERN_ERR "%s: could not allocate a buffer for " 286 pr_err("%s: could not allocate a buffer for "
287 "switch capabilities.\n", 287 "switch capabilities.\n",
288 mmc_hostname(card->host)); 288 mmc_hostname(card->host));
289 return -ENOMEM; 289 return -ENOMEM;
@@ -299,7 +299,7 @@ static int mmc_read_switch(struct mmc_card *card)
299 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT) 299 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
300 goto out; 300 goto out;
301 301
302 printk(KERN_WARNING "%s: problem reading Bus Speed modes.\n", 302 pr_warning("%s: problem reading Bus Speed modes.\n",
303 mmc_hostname(card->host)); 303 mmc_hostname(card->host));
304 err = 0; 304 err = 0;
305 305
@@ -319,7 +319,7 @@ static int mmc_read_switch(struct mmc_card *card)
319 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT) 319 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
320 goto out; 320 goto out;
321 321
322 printk(KERN_WARNING "%s: problem reading " 322 pr_warning("%s: problem reading "
323 "Driver Strength.\n", 323 "Driver Strength.\n",
324 mmc_hostname(card->host)); 324 mmc_hostname(card->host));
325 err = 0; 325 err = 0;
@@ -339,7 +339,7 @@ static int mmc_read_switch(struct mmc_card *card)
339 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT) 339 if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
340 goto out; 340 goto out;
341 341
342 printk(KERN_WARNING "%s: problem reading " 342 pr_warning("%s: problem reading "
343 "Current Limit.\n", 343 "Current Limit.\n",
344 mmc_hostname(card->host)); 344 mmc_hostname(card->host));
345 err = 0; 345 err = 0;
@@ -383,7 +383,7 @@ int mmc_sd_switch_hs(struct mmc_card *card)
383 383
384 status = kmalloc(64, GFP_KERNEL); 384 status = kmalloc(64, GFP_KERNEL);
385 if (!status) { 385 if (!status) {
386 printk(KERN_ERR "%s: could not allocate a buffer for " 386 pr_err("%s: could not allocate a buffer for "
387 "switch capabilities.\n", mmc_hostname(card->host)); 387 "switch capabilities.\n", mmc_hostname(card->host));
388 return -ENOMEM; 388 return -ENOMEM;
389 } 389 }
@@ -393,7 +393,7 @@ int mmc_sd_switch_hs(struct mmc_card *card)
393 goto out; 393 goto out;
394 394
395 if ((status[16] & 0xF) != 1) { 395 if ((status[16] & 0xF) != 1) {
396 printk(KERN_WARNING "%s: Problem switching card " 396 pr_warning("%s: Problem switching card "
397 "into high-speed mode!\n", 397 "into high-speed mode!\n",
398 mmc_hostname(card->host)); 398 mmc_hostname(card->host));
399 err = 0; 399 err = 0;
@@ -459,7 +459,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
459 return err; 459 return err;
460 460
461 if ((status[15] & 0xF) != drive_strength) { 461 if ((status[15] & 0xF) != drive_strength) {
462 printk(KERN_WARNING "%s: Problem setting drive strength!\n", 462 pr_warning("%s: Problem setting drive strength!\n",
463 mmc_hostname(card->host)); 463 mmc_hostname(card->host));
464 return 0; 464 return 0;
465 } 465 }
@@ -538,7 +538,7 @@ static int sd_set_bus_speed_mode(struct mmc_card *card, u8 *status)
538 return err; 538 return err;
539 539
540 if ((status[16] & 0xF) != card->sd_bus_speed) 540 if ((status[16] & 0xF) != card->sd_bus_speed)
541 printk(KERN_WARNING "%s: Problem setting bus speed mode!\n", 541 pr_warning("%s: Problem setting bus speed mode!\n",
542 mmc_hostname(card->host)); 542 mmc_hostname(card->host));
543 else { 543 else {
544 mmc_set_timing(card->host, timing); 544 mmc_set_timing(card->host, timing);
@@ -600,7 +600,7 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status)
600 return err; 600 return err;
601 601
602 if (((status[15] >> 4) & 0x0F) != current_limit) 602 if (((status[15] >> 4) & 0x0F) != current_limit)
603 printk(KERN_WARNING "%s: Problem setting current limit!\n", 603 pr_warning("%s: Problem setting current limit!\n",
604 mmc_hostname(card->host)); 604 mmc_hostname(card->host));
605 605
606 return 0; 606 return 0;
@@ -622,7 +622,7 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
622 622
623 status = kmalloc(64, GFP_KERNEL); 623 status = kmalloc(64, GFP_KERNEL);
624 if (!status) { 624 if (!status) {
625 printk(KERN_ERR "%s: could not allocate a buffer for " 625 pr_err("%s: could not allocate a buffer for "
626 "switch capabilities.\n", mmc_hostname(card->host)); 626 "switch capabilities.\n", mmc_hostname(card->host));
627 return -ENOMEM; 627 return -ENOMEM;
628 } 628 }
@@ -852,7 +852,7 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card,
852 ro = host->ops->get_ro(host); 852 ro = host->ops->get_ro(host);
853 853
854 if (ro < 0) { 854 if (ro < 0) {
855 printk(KERN_WARNING "%s: host does not " 855 pr_warning("%s: host does not "
856 "support reading read-only " 856 "support reading read-only "
857 "switch. assuming write-enable.\n", 857 "switch. assuming write-enable.\n",
858 mmc_hostname(host)); 858 mmc_hostname(host));
@@ -1166,7 +1166,7 @@ int mmc_attach_sd(struct mmc_host *host)
1166 * support. 1166 * support.
1167 */ 1167 */
1168 if (ocr & 0x7F) { 1168 if (ocr & 0x7F) {
1169 printk(KERN_WARNING "%s: card claims to support voltages " 1169 pr_warning("%s: card claims to support voltages "
1170 "below the defined range. These will be ignored.\n", 1170 "below the defined range. These will be ignored.\n",
1171 mmc_hostname(host)); 1171 mmc_hostname(host));
1172 ocr &= ~0x7F; 1172 ocr &= ~0x7F;
@@ -1174,7 +1174,7 @@ int mmc_attach_sd(struct mmc_host *host)
1174 1174
1175 if ((ocr & MMC_VDD_165_195) && 1175 if ((ocr & MMC_VDD_165_195) &&
1176 !(host->ocr_avail_sd & MMC_VDD_165_195)) { 1176 !(host->ocr_avail_sd & MMC_VDD_165_195)) {
1177 printk(KERN_WARNING "%s: SD card claims to support the " 1177 pr_warning("%s: SD card claims to support the "
1178 "incompletely defined 'low voltage range'. This " 1178 "incompletely defined 'low voltage range'. This "
1179 "will be ignored.\n", mmc_hostname(host)); 1179 "will be ignored.\n", mmc_hostname(host));
1180 ocr &= ~MMC_VDD_165_195; 1180 ocr &= ~MMC_VDD_165_195;
@@ -1213,7 +1213,7 @@ remove_card:
1213err: 1213err:
1214 mmc_detach_bus(host); 1214 mmc_detach_bus(host);
1215 1215
1216 printk(KERN_ERR "%s: error %d whilst initialising SD card\n", 1216 pr_err("%s: error %d whilst initialising SD card\n",
1217 mmc_hostname(host), err); 1217 mmc_hostname(host), err);
1218 1218
1219 return err; 1219 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)
112 cccr_vsn = data & 0x0f; 112 cccr_vsn = data & 0x0f;
113 113
114 if (cccr_vsn > SDIO_CCCR_REV_1_20) { 114 if (cccr_vsn > SDIO_CCCR_REV_1_20) {
115 printk(KERN_ERR "%s: unrecognised CCCR structure version %d\n", 115 pr_err("%s: unrecognised CCCR structure version %d\n",
116 mmc_hostname(card->host), cccr_vsn); 116 mmc_hostname(card->host), cccr_vsn);
117 return -EINVAL; 117 return -EINVAL;
118 } 118 }
@@ -777,7 +777,7 @@ int mmc_attach_sdio(struct mmc_host *host)
777 * support. 777 * support.
778 */ 778 */
779 if (ocr & 0x7F) { 779 if (ocr & 0x7F) {
780 printk(KERN_WARNING "%s: card claims to support voltages " 780 pr_warning("%s: card claims to support voltages "
781 "below the defined range. These will be ignored.\n", 781 "below the defined range. These will be ignored.\n",
782 mmc_hostname(host)); 782 mmc_hostname(host));
783 ocr &= ~0x7F; 783 ocr &= ~0x7F;
@@ -874,7 +874,7 @@ remove:
874err: 874err:
875 mmc_detach_bus(host); 875 mmc_detach_bus(host);
876 876
877 printk(KERN_ERR "%s: error %d whilst initialising SDIO card\n", 877 pr_err("%s: error %d whilst initialising SDIO card\n",
878 mmc_hostname(host), err); 878 mmc_hostname(host), err);
879 879
880 return err; 880 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)
173 drv->remove(func); 173 drv->remove(func);
174 174
175 if (func->irq_handler) { 175 if (func->irq_handler) {
176 printk(KERN_WARNING "WARNING: driver %s did not remove " 176 pr_warning("WARNING: driver %s did not remove "
177 "its interrupt handler!\n", drv->name); 177 "its interrupt handler!\n", drv->name);
178 sdio_claim_host(func); 178 sdio_claim_host(func);
179 sdio_release_irq(func); 179 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,
132 ret = -EINVAL; 132 ret = -EINVAL;
133 } 133 }
134 if (ret && ret != -EILSEQ && ret != -ENOENT) { 134 if (ret && ret != -EILSEQ && ret != -ENOENT) {
135 printk(KERN_ERR "%s: bad %s tuple 0x%02x (%u bytes)\n", 135 pr_err("%s: bad %s tuple 0x%02x (%u bytes)\n",
136 mmc_hostname(card->host), tpl_descr, code, size); 136 mmc_hostname(card->host), tpl_descr, code, size);
137 } 137 }
138 } else { 138 } else {
@@ -313,7 +313,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
313 313
314 if (ret == -ENOENT) { 314 if (ret == -ENOENT) {
315 /* warn about unknown tuples */ 315 /* warn about unknown tuples */
316 printk(KERN_WARNING "%s: queuing unknown" 316 pr_warning("%s: queuing unknown"
317 " CIS tuple 0x%02x (%u bytes)\n", 317 " CIS tuple 0x%02x (%u bytes)\n",
318 mmc_hostname(card->host), 318 mmc_hostname(card->host),
319 tpl_code, tpl_link); 319 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)
45 45
46 ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending); 46 ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending);
47 if (ret) { 47 if (ret) {
48 printk(KERN_DEBUG "%s: error %d reading SDIO_CCCR_INTx\n", 48 pr_debug("%s: error %d reading SDIO_CCCR_INTx\n",
49 mmc_card_id(card), ret); 49 mmc_card_id(card), ret);
50 return ret; 50 return ret;
51 } 51 }
@@ -55,7 +55,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
55 if (pending & (1 << i)) { 55 if (pending & (1 << i)) {
56 func = card->sdio_func[i - 1]; 56 func = card->sdio_func[i - 1];
57 if (!func) { 57 if (!func) {
58 printk(KERN_WARNING "%s: pending IRQ for " 58 pr_warning("%s: pending IRQ for "
59 "non-existent function\n", 59 "non-existent function\n",
60 mmc_card_id(card)); 60 mmc_card_id(card));
61 ret = -EINVAL; 61 ret = -EINVAL;
@@ -63,7 +63,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
63 func->irq_handler(func); 63 func->irq_handler(func);
64 count++; 64 count++;
65 } else { 65 } else {
66 printk(KERN_WARNING "%s: pending IRQ with no handler\n", 66 pr_warning("%s: pending IRQ with no handler\n",
67 sdio_func_id(func)); 67 sdio_func_id(func));
68 ret = -EINVAL; 68 ret = -EINVAL;
69 } 69 }
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index ef72e874ca36..707bc7dddd22 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -55,7 +55,7 @@
55 55
56#ifdef DEBUG 56#ifdef DEBUG
57#define DBG(fmt, idx, args...) \ 57#define DBG(fmt, idx, args...) \
58 printk(KERN_DEBUG "au1xmmc(%d): DEBUG: " fmt, idx, ##args) 58 pr_debug("au1xmmc(%d): DEBUG: " fmt, idx, ##args)
59#else 59#else
60#define DBG(fmt, idx, args...) do {} while (0) 60#define DBG(fmt, idx, args...) do {} while (0)
61#endif 61#endif
@@ -268,7 +268,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
268 mmccmd |= SD_CMD_RT_3; 268 mmccmd |= SD_CMD_RT_3;
269 break; 269 break;
270 default: 270 default:
271 printk(KERN_INFO "au1xmmc: unhandled response type %02x\n", 271 pr_info("au1xmmc: unhandled response type %02x\n",
272 mmc_resp_type(cmd)); 272 mmc_resp_type(cmd));
273 return -EINVAL; 273 return -EINVAL;
274 } 274 }
@@ -1031,7 +1031,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
1031#ifdef CONFIG_SOC_AU1200 1031#ifdef CONFIG_SOC_AU1200
1032 ret = au1xmmc_dbdma_init(host); 1032 ret = au1xmmc_dbdma_init(host);
1033 if (ret) 1033 if (ret)
1034 printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; using PIO\n"); 1034 pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
1035#endif 1035#endif
1036 1036
1037#ifdef CONFIG_LEDS_CLASS 1037#ifdef CONFIG_LEDS_CLASS
@@ -1056,7 +1056,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
1056 1056
1057 platform_set_drvdata(pdev, host); 1057 platform_set_drvdata(pdev, host);
1058 1058
1059 printk(KERN_INFO DRIVER_NAME ": MMC Controller %d set up at %8.8X" 1059 pr_info(DRIVER_NAME ": MMC Controller %d set up at %8.8X"
1060 " (mode=%s)\n", pdev->id, host->iobase, 1060 " (mode=%s)\n", pdev->id, host->iobase,
1061 host->flags & HOST_F_DMA ? "dma" : "pio"); 1061 host->flags & HOST_F_DMA ? "dma" : "pio");
1062 1062
@@ -1188,7 +1188,7 @@ static int __init au1xmmc_init(void)
1188 */ 1188 */
1189 memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev); 1189 memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
1190 if (!memid) 1190 if (!memid)
1191 printk(KERN_ERR "au1xmmc: cannot add memory dbdma dev\n"); 1191 pr_err("au1xmmc: cannot add memory dbdma dev\n");
1192#endif 1192#endif
1193 return platform_driver_register(&au1xmmc_driver); 1193 return platform_driver_register(&au1xmmc_driver);
1194} 1194}
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 0ed1d28922f9..701f14e8b54b 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1701,7 +1701,7 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
1701 1701
1702 host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); 1702 host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
1703 if (IS_ERR(host->vmmc)) { 1703 if (IS_ERR(host->vmmc)) {
1704 printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc)); 1704 pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc));
1705 host->vmmc = NULL; 1705 host->vmmc = NULL;
1706 } else 1706 } else
1707 regulator_enable(host->vmmc); 1707 regulator_enable(host->vmmc);
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 881f7ba545ae..ea0f3cedef21 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -942,7 +942,7 @@ static int __init imxmci_probe(struct platform_device *pdev)
942 int ret = 0, irq; 942 int ret = 0, irq;
943 u16 rev_no; 943 u16 rev_no;
944 944
945 printk(KERN_INFO "i.MX mmc driver\n"); 945 pr_info("i.MX mmc driver\n");
946 946
947 r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 947 r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
948 irq = platform_get_irq(pdev, 0); 948 irq = platform_get_irq(pdev, 0);
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 40e4c055812e..4602771658c0 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -464,7 +464,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
464 struct mmci_host_next *next = &host->next_data; 464 struct mmci_host_next *next = &host->next_data;
465 465
466 if (data->host_cookie && data->host_cookie != next->cookie) { 466 if (data->host_cookie && data->host_cookie != next->cookie) {
467 printk(KERN_WARNING "[%s] invalid cookie: data->host_cookie %d" 467 pr_warning("[%s] invalid cookie: data->host_cookie %d"
468 " host->next_data.cookie %d\n", 468 " host->next_data.cookie %d\n",
469 __func__, data->host_cookie, host->next_data.cookie); 469 __func__, data->host_cookie, host->next_data.cookie);
470 data->host_cookie = 0; 470 data->host_cookie = 0;
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 61c7d385fd3a..80d8eb143b48 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -389,7 +389,7 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data)
389 n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg, 389 n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg,
390 host->dma.num_ents, host->dma.dir); 390 host->dma.num_ents, host->dma.dir);
391 if (n == 0) { 391 if (n == 0) {
392 printk(KERN_ERR "%s: Unable to map in all sg elements\n", 392 pr_err("%s: Unable to map in all sg elements\n",
393 mmc_hostname(host->mmc)); 393 mmc_hostname(host->mmc));
394 host->dma.sg = NULL; 394 host->dma.sg = NULL;
395 host->dma.num_ents = 0; 395 host->dma.num_ents = 0;
@@ -475,7 +475,7 @@ msmsdcc_start_command_deferred(struct msmsdcc_host *host,
475 *c |= MCI_CSPM_MCIABORT; 475 *c |= MCI_CSPM_MCIABORT;
476 476
477 if (host->curr.cmd != NULL) { 477 if (host->curr.cmd != NULL) {
478 printk(KERN_ERR "%s: Overlapping command requests\n", 478 pr_err("%s: Overlapping command requests\n",
479 mmc_hostname(host->mmc)); 479 mmc_hostname(host->mmc));
480 } 480 }
481 host->curr.cmd = cmd; 481 host->curr.cmd = cmd;
@@ -1113,7 +1113,7 @@ msmsdcc_platform_status_irq(int irq, void *dev_id)
1113{ 1113{
1114 struct msmsdcc_host *host = dev_id; 1114 struct msmsdcc_host *host = dev_id;
1115 1115
1116 printk(KERN_DEBUG "%s: %d\n", __func__, irq); 1116 pr_debug("%s: %d\n", __func__, irq);
1117 msmsdcc_check_status((unsigned long) host); 1117 msmsdcc_check_status((unsigned long) host);
1118 return IRQ_HANDLED; 1118 return IRQ_HANDLED;
1119} 1119}
@@ -1123,7 +1123,7 @@ msmsdcc_status_notify_cb(int card_present, void *dev_id)
1123{ 1123{
1124 struct msmsdcc_host *host = dev_id; 1124 struct msmsdcc_host *host = dev_id;
1125 1125
1126 printk(KERN_DEBUG "%s: card_present %d\n", mmc_hostname(host->mmc), 1126 pr_debug("%s: card_present %d\n", mmc_hostname(host->mmc),
1127 card_present); 1127 card_present);
1128 msmsdcc_check_status((unsigned long) host); 1128 msmsdcc_check_status((unsigned long) host);
1129} 1129}
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a5bf60e01af4..211a4959c293 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -117,7 +117,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
117 host->pio_size = data->blocks * data->blksz; 117 host->pio_size = data->blocks * data->blksz;
118 host->pio_ptr = sg_virt(data->sg); 118 host->pio_ptr = sg_virt(data->sg);
119 if (!nodma) 119 if (!nodma)
120 printk(KERN_DEBUG "%s: fallback to PIO for data " 120 pr_debug("%s: fallback to PIO for data "
121 "at 0x%p size %d\n", 121 "at 0x%p size %d\n",
122 mmc_hostname(host->mmc), 122 mmc_hostname(host->mmc),
123 host->pio_ptr, host->pio_size); 123 host->pio_ptr, host->pio_size);
@@ -471,7 +471,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
471 if (mrq->data) 471 if (mrq->data)
472 err_status = mvsd_finish_data(host, mrq->data, err_status); 472 err_status = mvsd_finish_data(host, mrq->data, err_status);
473 if (err_status) { 473 if (err_status) {
474 printk(KERN_ERR "%s: unhandled error status %#04x\n", 474 pr_err("%s: unhandled error status %#04x\n",
475 mmc_hostname(host->mmc), err_status); 475 mmc_hostname(host->mmc), err_status);
476 cmd->error = -ENOMSG; 476 cmd->error = -ENOMSG;
477 } 477 }
@@ -489,7 +489,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
489 if (irq_handled) 489 if (irq_handled)
490 return IRQ_HANDLED; 490 return IRQ_HANDLED;
491 491
492 printk(KERN_ERR "%s: unhandled interrupt status=0x%04x en=0x%04x " 492 pr_err("%s: unhandled interrupt status=0x%04x en=0x%04x "
493 "pio=%d\n", mmc_hostname(host->mmc), intr_status, 493 "pio=%d\n", mmc_hostname(host->mmc), intr_status,
494 host->intr_en, host->pio_size); 494 host->intr_en, host->pio_size);
495 return IRQ_NONE; 495 return IRQ_NONE;
@@ -505,9 +505,9 @@ static void mvsd_timeout_timer(unsigned long data)
505 spin_lock_irqsave(&host->lock, flags); 505 spin_lock_irqsave(&host->lock, flags);
506 mrq = host->mrq; 506 mrq = host->mrq;
507 if (mrq) { 507 if (mrq) {
508 printk(KERN_ERR "%s: Timeout waiting for hardware interrupt.\n", 508 pr_err("%s: Timeout waiting for hardware interrupt.\n",
509 mmc_hostname(host->mmc)); 509 mmc_hostname(host->mmc));
510 printk(KERN_ERR "%s: hw_state=0x%04x, intr_status=0x%04x " 510 pr_err("%s: hw_state=0x%04x, intr_status=0x%04x "
511 "intr_en=0x%04x\n", mmc_hostname(host->mmc), 511 "intr_en=0x%04x\n", mmc_hostname(host->mmc),
512 mvsd_read(MVSD_HW_STATE), 512 mvsd_read(MVSD_HW_STATE),
513 mvsd_read(MVSD_NOR_INTR_STATUS), 513 mvsd_read(MVSD_NOR_INTR_STATUS),
@@ -762,7 +762,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
762 762
763 ret = request_irq(irq, mvsd_irq, 0, DRIVER_NAME, host); 763 ret = request_irq(irq, mvsd_irq, 0, DRIVER_NAME, host);
764 if (ret) { 764 if (ret) {
765 printk(KERN_ERR "%s: cannot assign irq %d\n", DRIVER_NAME, irq); 765 pr_err("%s: cannot assign irq %d\n", DRIVER_NAME, irq);
766 goto out; 766 goto out;
767 } else 767 } else
768 host->irq = irq; 768 host->irq = irq;
@@ -802,7 +802,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
802 if (ret) 802 if (ret)
803 goto out; 803 goto out;
804 804
805 printk(KERN_NOTICE "%s: %s driver initialized, ", 805 pr_notice("%s: %s driver initialized, ",
806 mmc_hostname(mmc), DRIVER_NAME); 806 mmc_hostname(mmc), DRIVER_NAME);
807 if (host->gpio_card_detect) 807 if (host->gpio_card_detect)
808 printk("using GPIO %d for card detection\n", 808 printk("using GPIO %d for card detection\n",
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 14aa213b00da..f48743de4673 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -842,7 +842,7 @@ static int mxcmci_probe(struct platform_device *pdev)
842 int ret = 0, irq; 842 int ret = 0, irq;
843 dma_cap_mask_t mask; 843 dma_cap_mask_t mask;
844 844
845 printk(KERN_INFO "i.MX SDHC driver\n"); 845 pr_info("i.MX SDHC driver\n");
846 846
847 iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); 847 iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
848 irq = platform_get_irq(pdev, 0); 848 irq = platform_get_irq(pdev, 0);
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 75c63955fa7f..3c900f34c13f 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1264,14 +1264,14 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
1264 host->reqs_blocked = 0; 1264 host->reqs_blocked = 0;
1265 if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) { 1265 if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) {
1266 if (host->protect_card) { 1266 if (host->protect_card) {
1267 printk(KERN_INFO "%s: cover is closed, " 1267 pr_info("%s: cover is closed, "
1268 "card is now accessible\n", 1268 "card is now accessible\n",
1269 mmc_hostname(host->mmc)); 1269 mmc_hostname(host->mmc));
1270 host->protect_card = 0; 1270 host->protect_card = 0;
1271 } 1271 }
1272 } else { 1272 } else {
1273 if (!host->protect_card) { 1273 if (!host->protect_card) {
1274 printk(KERN_INFO "%s: cover is open, " 1274 pr_info"%s: cover is open, "
1275 "card is now inaccessible\n", 1275 "card is now inaccessible\n",
1276 mmc_hostname(host->mmc)); 1276 mmc_hostname(host->mmc));
1277 host->protect_card = 1; 1277 host->protect_card = 1;
@@ -1422,7 +1422,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host,
1422 1422
1423 if (!next && data->host_cookie && 1423 if (!next && data->host_cookie &&
1424 data->host_cookie != host->next_data.cookie) { 1424 data->host_cookie != host->next_data.cookie) {
1425 printk(KERN_WARNING "[%s] invalid cookie: data->host_cookie %d" 1425 pr_warning("[%s] invalid cookie: data->host_cookie %d"
1426 " host->next_data.cookie %d\n", 1426 " host->next_data.cookie %d\n",
1427 __func__, data->host_cookie, host->next_data.cookie); 1427 __func__, data->host_cookie, host->next_data.cookie);
1428 data->host_cookie = 0; 1428 data->host_cookie = 0;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 7257738fd7da..fc4356e00d46 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -558,7 +558,7 @@ static void pxamci_dma_irq(int dma, void *devid)
558 if (dcsr & DCSR_ENDINTR) { 558 if (dcsr & DCSR_ENDINTR) {
559 writel(BUF_PART_FULL, host->base + MMC_PRTBUF); 559 writel(BUF_PART_FULL, host->base + MMC_PRTBUF);
560 } else { 560 } else {
561 printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n", 561 pr_err("%s: DMA error on channel %d (DCSR=%#x)\n",
562 mmc_hostname(host->mmc), dma, dcsr); 562 mmc_hostname(host->mmc), dma, dcsr);
563 host->data->error = -EIO; 563 host->data->error = -EIO;
564 pxamci_data_done(host, 0); 564 pxamci_data_done(host, 0);
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index a04f87d7ee3d..d2856b6b2a62 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -247,7 +247,7 @@ static void s3cmci_check_sdio_irq(struct s3cmci_host *host)
247{ 247{
248 if (host->sdio_irqen) { 248 if (host->sdio_irqen) {
249 if (gpio_get_value(S3C2410_GPE(8)) == 0) { 249 if (gpio_get_value(S3C2410_GPE(8)) == 0) {
250 printk(KERN_DEBUG "%s: signalling irq\n", __func__); 250 pr_debug("%s: signalling irq\n", __func__);
251 mmc_signal_sdio_irq(host->mmc); 251 mmc_signal_sdio_irq(host->mmc);
252 } 252 }
253 } 253 }
@@ -344,7 +344,7 @@ static void s3cmci_disable_irq(struct s3cmci_host *host, bool transfer)
344 344
345 local_irq_save(flags); 345 local_irq_save(flags);
346 346
347 //printk(KERN_DEBUG "%s: transfer %d\n", __func__, transfer); 347 /* pr_debug("%s: transfer %d\n", __func__, transfer); */
348 348
349 host->irq_disabled = transfer; 349 host->irq_disabled = transfer;
350 350
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 155deb8629af..2cc3ffa7d766 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -68,51 +68,51 @@ static inline int sdhci_runtime_pm_put(struct sdhci_host *host)
68 68
69static void sdhci_dumpregs(struct sdhci_host *host) 69static void sdhci_dumpregs(struct sdhci_host *host)
70{ 70{
71 printk(KERN_DEBUG DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n", 71 pr_debug(DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n",
72 mmc_hostname(host->mmc)); 72 mmc_hostname(host->mmc));
73 73
74 printk(KERN_DEBUG DRIVER_NAME ": Sys addr: 0x%08x | Version: 0x%08x\n", 74 pr_debug(DRIVER_NAME ": Sys addr: 0x%08x | Version: 0x%08x\n",
75 sdhci_readl(host, SDHCI_DMA_ADDRESS), 75 sdhci_readl(host, SDHCI_DMA_ADDRESS),
76 sdhci_readw(host, SDHCI_HOST_VERSION)); 76 sdhci_readw(host, SDHCI_HOST_VERSION));
77 printk(KERN_DEBUG DRIVER_NAME ": Blk size: 0x%08x | Blk cnt: 0x%08x\n", 77 pr_debug(DRIVER_NAME ": Blk size: 0x%08x | Blk cnt: 0x%08x\n",
78 sdhci_readw(host, SDHCI_BLOCK_SIZE), 78 sdhci_readw(host, SDHCI_BLOCK_SIZE),
79 sdhci_readw(host, SDHCI_BLOCK_COUNT)); 79 sdhci_readw(host, SDHCI_BLOCK_COUNT));
80 printk(KERN_DEBUG DRIVER_NAME ": Argument: 0x%08x | Trn mode: 0x%08x\n", 80 pr_debug(DRIVER_NAME ": Argument: 0x%08x | Trn mode: 0x%08x\n",
81 sdhci_readl(host, SDHCI_ARGUMENT), 81 sdhci_readl(host, SDHCI_ARGUMENT),
82 sdhci_readw(host, SDHCI_TRANSFER_MODE)); 82 sdhci_readw(host, SDHCI_TRANSFER_MODE));
83 printk(KERN_DEBUG DRIVER_NAME ": Present: 0x%08x | Host ctl: 0x%08x\n", 83 pr_debug(DRIVER_NAME ": Present: 0x%08x | Host ctl: 0x%08x\n",
84 sdhci_readl(host, SDHCI_PRESENT_STATE), 84 sdhci_readl(host, SDHCI_PRESENT_STATE),
85 sdhci_readb(host, SDHCI_HOST_CONTROL)); 85 sdhci_readb(host, SDHCI_HOST_CONTROL));
86 printk(KERN_DEBUG DRIVER_NAME ": Power: 0x%08x | Blk gap: 0x%08x\n", 86 pr_debug(DRIVER_NAME ": Power: 0x%08x | Blk gap: 0x%08x\n",
87 sdhci_readb(host, SDHCI_POWER_CONTROL), 87 sdhci_readb(host, SDHCI_POWER_CONTROL),
88 sdhci_readb(host, SDHCI_BLOCK_GAP_CONTROL)); 88 sdhci_readb(host, SDHCI_BLOCK_GAP_CONTROL));
89 printk(KERN_DEBUG DRIVER_NAME ": Wake-up: 0x%08x | Clock: 0x%08x\n", 89 pr_debug(DRIVER_NAME ": Wake-up: 0x%08x | Clock: 0x%08x\n",
90 sdhci_readb(host, SDHCI_WAKE_UP_CONTROL), 90 sdhci_readb(host, SDHCI_WAKE_UP_CONTROL),
91 sdhci_readw(host, SDHCI_CLOCK_CONTROL)); 91 sdhci_readw(host, SDHCI_CLOCK_CONTROL));
92 printk(KERN_DEBUG DRIVER_NAME ": Timeout: 0x%08x | Int stat: 0x%08x\n", 92 pr_debug(DRIVER_NAME ": Timeout: 0x%08x | Int stat: 0x%08x\n",
93 sdhci_readb(host, SDHCI_TIMEOUT_CONTROL), 93 sdhci_readb(host, SDHCI_TIMEOUT_CONTROL),
94 sdhci_readl(host, SDHCI_INT_STATUS)); 94 sdhci_readl(host, SDHCI_INT_STATUS));
95 printk(KERN_DEBUG DRIVER_NAME ": Int enab: 0x%08x | Sig enab: 0x%08x\n", 95 pr_debug(DRIVER_NAME ": Int enab: 0x%08x | Sig enab: 0x%08x\n",
96 sdhci_readl(host, SDHCI_INT_ENABLE), 96 sdhci_readl(host, SDHCI_INT_ENABLE),
97 sdhci_readl(host, SDHCI_SIGNAL_ENABLE)); 97 sdhci_readl(host, SDHCI_SIGNAL_ENABLE));
98 printk(KERN_DEBUG DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", 98 pr_debug(DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n",
99 sdhci_readw(host, SDHCI_ACMD12_ERR), 99 sdhci_readw(host, SDHCI_ACMD12_ERR),
100 sdhci_readw(host, SDHCI_SLOT_INT_STATUS)); 100 sdhci_readw(host, SDHCI_SLOT_INT_STATUS));
101 printk(KERN_DEBUG DRIVER_NAME ": Caps: 0x%08x | Caps_1: 0x%08x\n", 101 pr_debug(DRIVER_NAME ": Caps: 0x%08x | Caps_1: 0x%08x\n",
102 sdhci_readl(host, SDHCI_CAPABILITIES), 102 sdhci_readl(host, SDHCI_CAPABILITIES),
103 sdhci_readl(host, SDHCI_CAPABILITIES_1)); 103 sdhci_readl(host, SDHCI_CAPABILITIES_1));
104 printk(KERN_DEBUG DRIVER_NAME ": Cmd: 0x%08x | Max curr: 0x%08x\n", 104 pr_debug(DRIVER_NAME ": Cmd: 0x%08x | Max curr: 0x%08x\n",
105 sdhci_readw(host, SDHCI_COMMAND), 105 sdhci_readw(host, SDHCI_COMMAND),
106 sdhci_readl(host, SDHCI_MAX_CURRENT)); 106 sdhci_readl(host, SDHCI_MAX_CURRENT));
107 printk(KERN_DEBUG DRIVER_NAME ": Host ctl2: 0x%08x\n", 107 pr_debug(DRIVER_NAME ": Host ctl2: 0x%08x\n",
108 sdhci_readw(host, SDHCI_HOST_CONTROL2)); 108 sdhci_readw(host, SDHCI_HOST_CONTROL2));
109 109
110 if (host->flags & SDHCI_USE_ADMA) 110 if (host->flags & SDHCI_USE_ADMA)
111 printk(KERN_DEBUG DRIVER_NAME ": ADMA Err: 0x%08x | ADMA Ptr: 0x%08x\n", 111 pr_debug(DRIVER_NAME ": ADMA Err: 0x%08x | ADMA Ptr: 0x%08x\n",
112 readl(host->ioaddr + SDHCI_ADMA_ERROR), 112 readl(host->ioaddr + SDHCI_ADMA_ERROR),
113 readl(host->ioaddr + SDHCI_ADMA_ADDRESS)); 113 readl(host->ioaddr + SDHCI_ADMA_ADDRESS));
114 114
115 printk(KERN_DEBUG DRIVER_NAME ": ===========================================\n"); 115 pr_debug(DRIVER_NAME ": ===========================================\n");
116} 116}
117 117
118/*****************************************************************************\ 118/*****************************************************************************\
@@ -200,7 +200,7 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)
200 /* hw clears the bit when it's done */ 200 /* hw clears the bit when it's done */
201 while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) { 201 while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) {
202 if (timeout == 0) { 202 if (timeout == 0) {
203 printk(KERN_ERR "%s: Reset 0x%x never completed.\n", 203 pr_err("%s: Reset 0x%x never completed.\n",
204 mmc_hostname(host->mmc), (int)mask); 204 mmc_hostname(host->mmc), (int)mask);
205 sdhci_dumpregs(host); 205 sdhci_dumpregs(host);
206 return; 206 return;
@@ -677,7 +677,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
677 } 677 }
678 678
679 if (count >= 0xF) { 679 if (count >= 0xF) {
680 printk(KERN_WARNING "%s: Too large timeout requested for CMD%d!\n", 680 pr_warning("%s: Too large timeout requested for CMD%d!\n",
681 mmc_hostname(host->mmc), cmd->opcode); 681 mmc_hostname(host->mmc), cmd->opcode);
682 count = 0xE; 682 count = 0xE;
683 } 683 }
@@ -972,7 +972,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
972 972
973 while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) { 973 while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) {
974 if (timeout == 0) { 974 if (timeout == 0) {
975 printk(KERN_ERR "%s: Controller never released " 975 pr_err("%s: Controller never released "
976 "inhibit bit(s).\n", mmc_hostname(host->mmc)); 976 "inhibit bit(s).\n", mmc_hostname(host->mmc));
977 sdhci_dumpregs(host); 977 sdhci_dumpregs(host);
978 cmd->error = -EIO; 978 cmd->error = -EIO;
@@ -994,7 +994,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
994 sdhci_set_transfer_mode(host, cmd); 994 sdhci_set_transfer_mode(host, cmd);
995 995
996 if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) { 996 if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) {
997 printk(KERN_ERR "%s: Unsupported response type!\n", 997 pr_err("%s: Unsupported response type!\n",
998 mmc_hostname(host->mmc)); 998 mmc_hostname(host->mmc));
999 cmd->error = -EINVAL; 999 cmd->error = -EINVAL;
1000 tasklet_schedule(&host->finish_tasklet); 1000 tasklet_schedule(&host->finish_tasklet);
@@ -1144,7 +1144,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
1144 while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) 1144 while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
1145 & SDHCI_CLOCK_INT_STABLE)) { 1145 & SDHCI_CLOCK_INT_STABLE)) {
1146 if (timeout == 0) { 1146 if (timeout == 0) {
1147 printk(KERN_ERR "%s: Internal clock never " 1147 pr_err("%s: Internal clock never "
1148 "stabilised.\n", mmc_hostname(host->mmc)); 1148 "stabilised.\n", mmc_hostname(host->mmc));
1149 sdhci_dumpregs(host); 1149 sdhci_dumpregs(host);
1150 return; 1150 return;
@@ -1582,7 +1582,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host,
1582 if (!(ctrl & SDHCI_CTRL_VDD_180)) 1582 if (!(ctrl & SDHCI_CTRL_VDD_180))
1583 return 0; 1583 return 0;
1584 else { 1584 else {
1585 printk(KERN_INFO DRIVER_NAME ": Switching to 3.3V " 1585 pr_info(DRIVER_NAME ": Switching to 3.3V "
1586 "signalling voltage failed\n"); 1586 "signalling voltage failed\n");
1587 return -EIO; 1587 return -EIO;
1588 } 1588 }
@@ -1641,7 +1641,7 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host,
1641 pwr |= SDHCI_POWER_ON; 1641 pwr |= SDHCI_POWER_ON;
1642 sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); 1642 sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
1643 1643
1644 printk(KERN_INFO DRIVER_NAME ": Switching to 1.8V signalling " 1644 pr_info(DRIVER_NAME ": Switching to 1.8V signalling "
1645 "voltage failed, retrying with S18R set to 0\n"); 1645 "voltage failed, retrying with S18R set to 0\n");
1646 return -EAGAIN; 1646 return -EAGAIN;
1647 } else 1647 } else
@@ -1764,7 +1764,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)
1764 spin_lock(&host->lock); 1764 spin_lock(&host->lock);
1765 1765
1766 if (!host->tuning_done) { 1766 if (!host->tuning_done) {
1767 printk(KERN_INFO DRIVER_NAME ": Timeout waiting for " 1767 pr_info(DRIVER_NAME ": Timeout waiting for "
1768 "Buffer Read Ready interrupt during tuning " 1768 "Buffer Read Ready interrupt during tuning "
1769 "procedure, falling back to fixed sampling " 1769 "procedure, falling back to fixed sampling "
1770 "clock\n"); 1770 "clock\n");
@@ -1794,7 +1794,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)
1794 sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); 1794 sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
1795 } else { 1795 } else {
1796 if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) { 1796 if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) {
1797 printk(KERN_INFO DRIVER_NAME ": Tuning procedure" 1797 pr_info(DRIVER_NAME ": Tuning procedure"
1798 " failed, falling back to fixed sampling" 1798 " failed, falling back to fixed sampling"
1799 " clock\n"); 1799 " clock\n");
1800 err = -EIO; 1800 err = -EIO;
@@ -1909,9 +1909,9 @@ static void sdhci_tasklet_card(unsigned long param)
1909 /* Check host->mrq first in case we are runtime suspended */ 1909 /* Check host->mrq first in case we are runtime suspended */
1910 if (host->mrq && 1910 if (host->mrq &&
1911 !(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) { 1911 !(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) {
1912 printk(KERN_ERR "%s: Card removed during transfer!\n", 1912 pr_err("%s: Card removed during transfer!\n",
1913 mmc_hostname(host->mmc)); 1913 mmc_hostname(host->mmc));
1914 printk(KERN_ERR "%s: Resetting controller.\n", 1914 pr_err("%s: Resetting controller.\n",
1915 mmc_hostname(host->mmc)); 1915 mmc_hostname(host->mmc));
1916 1916
1917 sdhci_reset(host, SDHCI_RESET_CMD); 1917 sdhci_reset(host, SDHCI_RESET_CMD);
@@ -2000,7 +2000,7 @@ static void sdhci_timeout_timer(unsigned long data)
2000 spin_lock_irqsave(&host->lock, flags); 2000 spin_lock_irqsave(&host->lock, flags);
2001 2001
2002 if (host->mrq) { 2002 if (host->mrq) {
2003 printk(KERN_ERR "%s: Timeout waiting for hardware " 2003 pr_err("%s: Timeout waiting for hardware "
2004 "interrupt.\n", mmc_hostname(host->mmc)); 2004 "interrupt.\n", mmc_hostname(host->mmc));
2005 sdhci_dumpregs(host); 2005 sdhci_dumpregs(host);
2006 2006
@@ -2046,7 +2046,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)
2046 BUG_ON(intmask == 0); 2046 BUG_ON(intmask == 0);
2047 2047
2048 if (!host->cmd) { 2048 if (!host->cmd) {
2049 printk(KERN_ERR "%s: Got command interrupt 0x%08x even " 2049 pr_err("%s: Got command interrupt 0x%08x even "
2050 "though no command operation was in progress.\n", 2050 "though no command operation was in progress.\n",
2051 mmc_hostname(host->mmc), (unsigned)intmask); 2051 mmc_hostname(host->mmc), (unsigned)intmask);
2052 sdhci_dumpregs(host); 2052 sdhci_dumpregs(host);
@@ -2146,7 +2146,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
2146 } 2146 }
2147 } 2147 }
2148 2148
2149 printk(KERN_ERR "%s: Got data interrupt 0x%08x even " 2149 pr_err("%s: Got data interrupt 0x%08x even "
2150 "though no data operation was in progress.\n", 2150 "though no data operation was in progress.\n",
2151 mmc_hostname(host->mmc), (unsigned)intmask); 2151 mmc_hostname(host->mmc), (unsigned)intmask);
2152 sdhci_dumpregs(host); 2152 sdhci_dumpregs(host);
@@ -2163,7 +2163,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
2163 != MMC_BUS_TEST_R) 2163 != MMC_BUS_TEST_R)
2164 host->data->error = -EILSEQ; 2164 host->data->error = -EILSEQ;
2165 else if (intmask & SDHCI_INT_ADMA_ERROR) { 2165 else if (intmask & SDHCI_INT_ADMA_ERROR) {
2166 printk(KERN_ERR "%s: ADMA error\n", mmc_hostname(host->mmc)); 2166 pr_err("%s: ADMA error\n", mmc_hostname(host->mmc));
2167 sdhci_show_adma_error(host); 2167 sdhci_show_adma_error(host);
2168 host->data->error = -EIO; 2168 host->data->error = -EIO;
2169 } 2169 }
@@ -2227,7 +2227,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
2227 2227
2228 if (host->runtime_suspended) { 2228 if (host->runtime_suspended) {
2229 spin_unlock(&host->lock); 2229 spin_unlock(&host->lock);
2230 printk(KERN_WARNING "%s: got irq while runtime suspended\n", 2230 pr_warning("%s: got irq while runtime suspended\n",
2231 mmc_hostname(host->mmc)); 2231 mmc_hostname(host->mmc));
2232 return IRQ_HANDLED; 2232 return IRQ_HANDLED;
2233 } 2233 }
@@ -2284,7 +2284,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
2284 intmask &= ~SDHCI_INT_ERROR; 2284 intmask &= ~SDHCI_INT_ERROR;
2285 2285
2286 if (intmask & SDHCI_INT_BUS_POWER) { 2286 if (intmask & SDHCI_INT_BUS_POWER) {
2287 printk(KERN_ERR "%s: Card is consuming too much power!\n", 2287 pr_err("%s: Card is consuming too much power!\n",
2288 mmc_hostname(host->mmc)); 2288 mmc_hostname(host->mmc));
2289 sdhci_writel(host, SDHCI_INT_BUS_POWER, SDHCI_INT_STATUS); 2289 sdhci_writel(host, SDHCI_INT_BUS_POWER, SDHCI_INT_STATUS);
2290 } 2290 }
@@ -2297,7 +2297,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
2297 intmask &= ~SDHCI_INT_CARD_INT; 2297 intmask &= ~SDHCI_INT_CARD_INT;
2298 2298
2299 if (intmask) { 2299 if (intmask) {
2300 printk(KERN_ERR "%s: Unexpected interrupt 0x%08x.\n", 2300 pr_err("%s: Unexpected interrupt 0x%08x.\n",
2301 mmc_hostname(host->mmc), intmask); 2301 mmc_hostname(host->mmc), intmask);
2302 sdhci_dumpregs(host); 2302 sdhci_dumpregs(host);
2303 2303
@@ -2538,7 +2538,7 @@ int sdhci_add_host(struct sdhci_host *host)
2538 host->version = (host->version & SDHCI_SPEC_VER_MASK) 2538 host->version = (host->version & SDHCI_SPEC_VER_MASK)
2539 >> SDHCI_SPEC_VER_SHIFT; 2539 >> SDHCI_SPEC_VER_SHIFT;
2540 if (host->version > SDHCI_SPEC_300) { 2540 if (host->version > SDHCI_SPEC_300) {
2541 printk(KERN_ERR "%s: Unknown controller version (%d). " 2541 pr_err("%s: Unknown controller version (%d). "
2542 "You may experience problems.\n", mmc_hostname(mmc), 2542 "You may experience problems.\n", mmc_hostname(mmc),
2543 host->version); 2543 host->version);
2544 } 2544 }
@@ -2575,7 +2575,7 @@ int sdhci_add_host(struct sdhci_host *host)
2575 if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { 2575 if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
2576 if (host->ops->enable_dma) { 2576 if (host->ops->enable_dma) {
2577 if (host->ops->enable_dma(host)) { 2577 if (host->ops->enable_dma(host)) {
2578 printk(KERN_WARNING "%s: No suitable DMA " 2578 pr_warning("%s: No suitable DMA "
2579 "available. Falling back to PIO.\n", 2579 "available. Falling back to PIO.\n",
2580 mmc_hostname(mmc)); 2580 mmc_hostname(mmc));
2581 host->flags &= 2581 host->flags &=
@@ -2595,7 +2595,7 @@ int sdhci_add_host(struct sdhci_host *host)
2595 if (!host->adma_desc || !host->align_buffer) { 2595 if (!host->adma_desc || !host->align_buffer) {
2596 kfree(host->adma_desc); 2596 kfree(host->adma_desc);
2597 kfree(host->align_buffer); 2597 kfree(host->align_buffer);
2598 printk(KERN_WARNING "%s: Unable to allocate ADMA " 2598 pr_warning("%s: Unable to allocate ADMA "
2599 "buffers. Falling back to standard DMA.\n", 2599 "buffers. Falling back to standard DMA.\n",
2600 mmc_hostname(mmc)); 2600 mmc_hostname(mmc));
2601 host->flags &= ~SDHCI_USE_ADMA; 2601 host->flags &= ~SDHCI_USE_ADMA;
@@ -2623,8 +2623,7 @@ int sdhci_add_host(struct sdhci_host *host)
2623 if (host->max_clk == 0 || host->quirks & 2623 if (host->max_clk == 0 || host->quirks &
2624 SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) { 2624 SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) {
2625 if (!host->ops->get_max_clock) { 2625 if (!host->ops->get_max_clock) {
2626 printk(KERN_ERR 2626 pr_err("%s: Hardware doesn't specify base clock "
2627 "%s: Hardware doesn't specify base clock "
2628 "frequency.\n", mmc_hostname(mmc)); 2627 "frequency.\n", mmc_hostname(mmc));
2629 return -ENODEV; 2628 return -ENODEV;
2630 } 2629 }
@@ -2670,8 +2669,7 @@ int sdhci_add_host(struct sdhci_host *host)
2670 host->timeout_clk = host->ops->get_timeout_clock(host); 2669 host->timeout_clk = host->ops->get_timeout_clock(host);
2671 } else if (!(host->quirks & 2670 } else if (!(host->quirks &
2672 SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) { 2671 SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
2673 printk(KERN_ERR 2672 pr_err("%s: Hardware doesn't specify timeout clock "
2674 "%s: Hardware doesn't specify timeout clock "
2675 "frequency.\n", mmc_hostname(mmc)); 2673 "frequency.\n", mmc_hostname(mmc));
2676 return -ENODEV; 2674 return -ENODEV;
2677 } 2675 }
@@ -2830,7 +2828,7 @@ int sdhci_add_host(struct sdhci_host *host)
2830 mmc->ocr_avail_mmc &= host->ocr_avail_mmc; 2828 mmc->ocr_avail_mmc &= host->ocr_avail_mmc;
2831 2829
2832 if (mmc->ocr_avail == 0) { 2830 if (mmc->ocr_avail == 0) {
2833 printk(KERN_ERR "%s: Hardware doesn't report any " 2831 pr_err("%s: Hardware doesn't report any "
2834 "support voltages.\n", mmc_hostname(mmc)); 2832 "support voltages.\n", mmc_hostname(mmc));
2835 return -ENODEV; 2833 return -ENODEV;
2836 } 2834 }
@@ -2878,7 +2876,7 @@ int sdhci_add_host(struct sdhci_host *host)
2878 mmc->max_blk_size = (caps[0] & SDHCI_MAX_BLOCK_MASK) >> 2876 mmc->max_blk_size = (caps[0] & SDHCI_MAX_BLOCK_MASK) >>
2879 SDHCI_MAX_BLOCK_SHIFT; 2877 SDHCI_MAX_BLOCK_SHIFT;
2880 if (mmc->max_blk_size >= 3) { 2878 if (mmc->max_blk_size >= 3) {
2881 printk(KERN_WARNING "%s: Invalid maximum block size, " 2879 pr_warning("%s: Invalid maximum block size, "
2882 "assuming 512 bytes\n", mmc_hostname(mmc)); 2880 "assuming 512 bytes\n", mmc_hostname(mmc));
2883 mmc->max_blk_size = 0; 2881 mmc->max_blk_size = 0;
2884 } 2882 }
@@ -2917,7 +2915,7 @@ int sdhci_add_host(struct sdhci_host *host)
2917 2915
2918 host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); 2916 host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
2919 if (IS_ERR(host->vmmc)) { 2917 if (IS_ERR(host->vmmc)) {
2920 printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc)); 2918 pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc));
2921 host->vmmc = NULL; 2919 host->vmmc = NULL;
2922 } else { 2920 } else {
2923 regulator_enable(host->vmmc); 2921 regulator_enable(host->vmmc);
@@ -2946,7 +2944,7 @@ int sdhci_add_host(struct sdhci_host *host)
2946 2944
2947 mmc_add_host(mmc); 2945 mmc_add_host(mmc);
2948 2946
2949 printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s\n", 2947 pr_info("%s: SDHCI controller on %s [%s] using %s\n",
2950 mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), 2948 mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
2951 (host->flags & SDHCI_USE_ADMA) ? "ADMA" : 2949 (host->flags & SDHCI_USE_ADMA) ? "ADMA" :
2952 (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); 2950 (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO");
@@ -2979,7 +2977,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
2979 host->flags |= SDHCI_DEVICE_DEAD; 2977 host->flags |= SDHCI_DEVICE_DEAD;
2980 2978
2981 if (host->mrq) { 2979 if (host->mrq) {
2982 printk(KERN_ERR "%s: Controller removed during " 2980 pr_err("%s: Controller removed during "
2983 " transfer!\n", mmc_hostname(host->mmc)); 2981 " transfer!\n", mmc_hostname(host->mmc));
2984 2982
2985 host->mrq->cmd->error = -ENOMEDIUM; 2983 host->mrq->cmd->error = -ENOMEDIUM;
@@ -3038,9 +3036,9 @@ EXPORT_SYMBOL_GPL(sdhci_free_host);
3038 3036
3039static int __init sdhci_drv_init(void) 3037static int __init sdhci_drv_init(void)
3040{ 3038{
3041 printk(KERN_INFO DRIVER_NAME 3039 pr_info(DRIVER_NAME
3042 ": Secure Digital Host Controller Interface driver\n"); 3040 ": Secure Digital Host Controller Interface driver\n");
3043 printk(KERN_INFO DRIVER_NAME ": Copyright(c) Pierre Ossman\n"); 3041 pr_info(DRIVER_NAME ": Copyright(c) Pierre Ossman\n");
3044 3042
3045 return 0; 3043 return 0;
3046} 3044}
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index 90c6b1b5da47..f70d04664cac 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -632,7 +632,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
632 } 632 }
633 633
634 if (host->req) { 634 if (host->req) {
635 printk(KERN_ERR "%s : unfinished request detected\n", 635 pr_err("%s : unfinished request detected\n",
636 dev_name(&sock->dev)); 636 dev_name(&sock->dev));
637 mrq->cmd->error = -ETIMEDOUT; 637 mrq->cmd->error = -ETIMEDOUT;
638 goto err_out; 638 goto err_out;
@@ -672,7 +672,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
672 r_data->flags & MMC_DATA_WRITE 672 r_data->flags & MMC_DATA_WRITE
673 ? PCI_DMA_TODEVICE 673 ? PCI_DMA_TODEVICE
674 : PCI_DMA_FROMDEVICE)) { 674 : PCI_DMA_FROMDEVICE)) {
675 printk(KERN_ERR "%s : scatterlist map failed\n", 675 pr_err("%s : scatterlist map failed\n",
676 dev_name(&sock->dev)); 676 dev_name(&sock->dev));
677 mrq->cmd->error = -ENOMEM; 677 mrq->cmd->error = -ENOMEM;
678 goto err_out; 678 goto err_out;
@@ -684,7 +684,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
684 ? PCI_DMA_TODEVICE 684 ? PCI_DMA_TODEVICE
685 : PCI_DMA_FROMDEVICE); 685 : PCI_DMA_FROMDEVICE);
686 if (host->sg_len < 1) { 686 if (host->sg_len < 1) {
687 printk(KERN_ERR "%s : scatterlist map failed\n", 687 pr_err("%s : scatterlist map failed\n",
688 dev_name(&sock->dev)); 688 dev_name(&sock->dev));
689 tifm_unmap_sg(sock, &host->bounce_buf, 1, 689 tifm_unmap_sg(sock, &host->bounce_buf, 1,
690 r_data->flags & MMC_DATA_WRITE 690 r_data->flags & MMC_DATA_WRITE
@@ -748,7 +748,7 @@ static void tifm_sd_end_cmd(unsigned long data)
748 host->req = NULL; 748 host->req = NULL;
749 749
750 if (!mrq) { 750 if (!mrq) {
751 printk(KERN_ERR " %s : no request to complete?\n", 751 pr_err(" %s : no request to complete?\n",
752 dev_name(&sock->dev)); 752 dev_name(&sock->dev));
753 spin_unlock_irqrestore(&sock->lock, flags); 753 spin_unlock_irqrestore(&sock->lock, flags);
754 return; 754 return;
@@ -787,8 +787,7 @@ static void tifm_sd_abort(unsigned long data)
787{ 787{
788 struct tifm_sd *host = (struct tifm_sd*)data; 788 struct tifm_sd *host = (struct tifm_sd*)data;
789 789
790 printk(KERN_ERR 790 pr_err("%s : card failed to respond for a long period of time "
791 "%s : card failed to respond for a long period of time "
792 "(%x, %x)\n", 791 "(%x, %x)\n",
793 dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags); 792 dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags);
794 793
@@ -906,7 +905,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
906 } 905 }
907 906
908 if (rc) { 907 if (rc) {
909 printk(KERN_ERR "%s : controller failed to reset\n", 908 pr_err("%s : controller failed to reset\n",
910 dev_name(&sock->dev)); 909 dev_name(&sock->dev));
911 return -ENODEV; 910 return -ENODEV;
912 } 911 }
@@ -932,8 +931,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
932 } 931 }
933 932
934 if (rc) { 933 if (rc) {
935 printk(KERN_ERR 934 pr_err("%s : card not ready - probe failed on initialization\n",
936 "%s : card not ready - probe failed on initialization\n",
937 dev_name(&sock->dev)); 935 dev_name(&sock->dev));
938 return -ENODEV; 936 return -ENODEV;
939 } 937 }
@@ -954,7 +952,7 @@ static int tifm_sd_probe(struct tifm_dev *sock)
954 952
955 if (!(TIFM_SOCK_STATE_OCCUPIED 953 if (!(TIFM_SOCK_STATE_OCCUPIED
956 & readl(sock->addr + SOCK_PRESENT_STATE))) { 954 & readl(sock->addr + SOCK_PRESENT_STATE))) {
957 printk(KERN_WARNING "%s : card gone, unexpectedly\n", 955 pr_warning("%s : card gone, unexpectedly\n",
958 dev_name(&sock->dev)); 956 dev_name(&sock->dev));
959 return rc; 957 return rc;
960 } 958 }
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 6275e3d76d39..d85a60cda167 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -92,7 +92,7 @@ static int tmio_mmc_next_sg(struct tmio_mmc_host *host)
92static void pr_debug_status(u32 status) 92static void pr_debug_status(u32 status)
93{ 93{
94 int i = 0; 94 int i = 0;
95 printk(KERN_DEBUG "status: %08x = ", status); 95 pr_debug("status: %08x = ", status);
96 STATUS_TO_TEXT(CARD_REMOVE, status, i); 96 STATUS_TO_TEXT(CARD_REMOVE, status, i);
97 STATUS_TO_TEXT(CARD_INSERT, status, i); 97 STATUS_TO_TEXT(CARD_INSERT, status, i);
98 STATUS_TO_TEXT(SIGSTATE, status, i); 98 STATUS_TO_TEXT(SIGSTATE, status, i);
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index faf3594745f5..4b83c43f950d 100644
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -1192,7 +1192,7 @@ static void __devexit via_sd_remove(struct pci_dev *pcidev)
1192 mmiowb(); 1192 mmiowb();
1193 1193
1194 if (sdhost->mrq) { 1194 if (sdhost->mrq) {
1195 printk(KERN_ERR "%s: Controller removed during " 1195 pr_err("%s: Controller removed during "
1196 "transfer\n", mmc_hostname(sdhost->mmc)); 1196 "transfer\n", mmc_hostname(sdhost->mmc));
1197 1197
1198 /* make sure all DMA is stopped */ 1198 /* make sure all DMA is stopped */
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 62e5a4d171e1..64acd9ce141c 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -194,7 +194,7 @@ static void wbsd_reset(struct wbsd_host *host)
194{ 194{
195 u8 setup; 195 u8 setup;
196 196
197 printk(KERN_ERR "%s: Resetting chip\n", mmc_hostname(host->mmc)); 197 pr_err("%s: Resetting chip\n", mmc_hostname(host->mmc));
198 198
199 /* 199 /*
200 * Soft reset of chip (SD/MMC part). 200 * Soft reset of chip (SD/MMC part).
@@ -721,7 +721,7 @@ static void wbsd_finish_data(struct wbsd_host *host, struct mmc_data *data)
721 * Any leftover data? 721 * Any leftover data?
722 */ 722 */
723 if (count) { 723 if (count) {
724 printk(KERN_ERR "%s: Incomplete DMA transfer. " 724 pr_err("%s: Incomplete DMA transfer. "
725 "%d bytes left.\n", 725 "%d bytes left.\n",
726 mmc_hostname(host->mmc), count); 726 mmc_hostname(host->mmc), count);
727 727
@@ -803,7 +803,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
803 803
804 default: 804 default:
805#ifdef CONFIG_MMC_DEBUG 805#ifdef CONFIG_MMC_DEBUG
806 printk(KERN_WARNING "%s: Data command %d is not " 806 pr_warning("%s: Data command %d is not "
807 "supported by this controller.\n", 807 "supported by this controller.\n",
808 mmc_hostname(host->mmc), cmd->opcode); 808 mmc_hostname(host->mmc), cmd->opcode);
809#endif 809#endif
@@ -1029,7 +1029,7 @@ static void wbsd_tasklet_card(unsigned long param)
1029 host->flags &= ~WBSD_FCARD_PRESENT; 1029 host->flags &= ~WBSD_FCARD_PRESENT;
1030 1030
1031 if (host->mrq) { 1031 if (host->mrq) {
1032 printk(KERN_ERR "%s: Card removed during transfer!\n", 1032 pr_err("%s: Card removed during transfer!\n",
1033 mmc_hostname(host->mmc)); 1033 mmc_hostname(host->mmc));
1034 wbsd_reset(host); 1034 wbsd_reset(host);
1035 1035
@@ -1429,7 +1429,7 @@ free:
1429 free_dma(dma); 1429 free_dma(dma);
1430 1430
1431err: 1431err:
1432 printk(KERN_WARNING DRIVER_NAME ": Unable to allocate DMA %d. " 1432 pr_warning(DRIVER_NAME ": Unable to allocate DMA %d. "
1433 "Falling back on FIFO.\n", dma); 1433 "Falling back on FIFO.\n", dma);
1434} 1434}
1435 1435
@@ -1664,7 +1664,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
1664 ret = wbsd_scan(host); 1664 ret = wbsd_scan(host);
1665 if (ret) { 1665 if (ret) {
1666 if (pnp && (ret == -ENODEV)) { 1666 if (pnp && (ret == -ENODEV)) {
1667 printk(KERN_WARNING DRIVER_NAME 1667 pr_warning(DRIVER_NAME
1668 ": Unable to confirm device presence. You may " 1668 ": Unable to confirm device presence. You may "
1669 "experience lock-ups.\n"); 1669 "experience lock-ups.\n");
1670 } else { 1670 } else {
@@ -1688,7 +1688,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
1688 */ 1688 */
1689 if (pnp) { 1689 if (pnp) {
1690 if ((host->config != 0) && !wbsd_chip_validate(host)) { 1690 if ((host->config != 0) && !wbsd_chip_validate(host)) {
1691 printk(KERN_WARNING DRIVER_NAME 1691 pr_warning(DRIVER_NAME
1692 ": PnP active but chip not configured! " 1692 ": PnP active but chip not configured! "
1693 "You probably have a buggy BIOS. " 1693 "You probably have a buggy BIOS. "
1694 "Configuring chip manually.\n"); 1694 "Configuring chip manually.\n");
@@ -1720,7 +1720,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
1720 1720
1721 mmc_add_host(mmc); 1721 mmc_add_host(mmc);
1722 1722
1723 printk(KERN_INFO "%s: W83L51xD", mmc_hostname(mmc)); 1723 pr_info("%s: W83L51xD", mmc_hostname(mmc));
1724 if (host->chip_id != 0) 1724 if (host->chip_id != 0)
1725 printk(" id %x", (int)host->chip_id); 1725 printk(" id %x", (int)host->chip_id);
1726 printk(" at 0x%x irq %d", (int)host->base, (int)host->irq); 1726 printk(" at 0x%x irq %d", (int)host->base, (int)host->irq);
@@ -1909,7 +1909,7 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
1909 */ 1909 */
1910 if (host->config != 0) { 1910 if (host->config != 0) {
1911 if (!wbsd_chip_validate(host)) { 1911 if (!wbsd_chip_validate(host)) {
1912 printk(KERN_WARNING DRIVER_NAME 1912 pr_warning(DRIVER_NAME
1913 ": PnP active but chip not configured! " 1913 ": PnP active but chip not configured! "
1914 "You probably have a buggy BIOS. " 1914 "You probably have a buggy BIOS. "
1915 "Configuring chip manually.\n"); 1915 "Configuring chip manually.\n");
@@ -1973,9 +1973,9 @@ static int __init wbsd_drv_init(void)
1973{ 1973{
1974 int result; 1974 int result;
1975 1975
1976 printk(KERN_INFO DRIVER_NAME 1976 pr_info(DRIVER_NAME
1977 ": Winbond W83L51xD SD/MMC card interface driver\n"); 1977 ": Winbond W83L51xD SD/MMC card interface driver\n");
1978 printk(KERN_INFO DRIVER_NAME ": Copyright(c) Pierre Ossman\n"); 1978 pr_info(DRIVER_NAME ": Copyright(c) Pierre Ossman\n");
1979 1979
1980#ifdef CONFIG_PNP 1980#ifdef CONFIG_PNP
1981 1981