Commit a3c76eb9 authored by Girish K S's avatar Girish K S Committed by Chris Ball

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: default avatarGirish K S <girish.shivananjappa@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent b23cf0bd
...@@ -937,7 +937,7 @@ static int mmc_blk_err_check(struct mmc_card *card, ...@@ -937,7 +937,7 @@ static int mmc_blk_err_check(struct mmc_card *card,
do { do {
int err = get_card_status(card, &status, 5); int err = get_card_status(card, &status, 5);
if (err) { if (err) {
printk(KERN_ERR "%s: error %d requesting status\n", pr_err("%s: error %d requesting status\n",
req->rq_disk->disk_name, err); req->rq_disk->disk_name, err);
return MMC_BLK_CMD_ERR; return MMC_BLK_CMD_ERR;
} }
...@@ -1187,7 +1187,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) ...@@ -1187,7 +1187,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
* were returned by the host controller, it's a bug. * were returned by the host controller, it's a bug.
*/ */
if (status == MMC_BLK_SUCCESS && ret) { if (status == MMC_BLK_SUCCESS && ret) {
printk(KERN_ERR "%s BUG rq_tot %d d_xfer %d\n", pr_err("%s BUG rq_tot %d d_xfer %d\n",
__func__, blk_rq_bytes(req), __func__, blk_rq_bytes(req),
brq->data.bytes_xfered); brq->data.bytes_xfered);
rqc = NULL; rqc = NULL;
...@@ -1467,7 +1467,7 @@ static int mmc_blk_alloc_part(struct mmc_card *card, ...@@ -1467,7 +1467,7 @@ static int mmc_blk_alloc_part(struct mmc_card *card,
string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2, string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2,
cap_str, sizeof(cap_str)); cap_str, sizeof(cap_str));
printk(KERN_INFO "%s: %s %s partition %u %s\n", pr_info("%s: %s %s partition %u %s\n",
part_md->disk->disk_name, mmc_card_id(card), part_md->disk->disk_name, mmc_card_id(card),
mmc_card_name(card), part_md->part_type, cap_str); mmc_card_name(card), part_md->part_type, cap_str);
return 0; return 0;
...@@ -1511,7 +1511,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card) ...@@ -1511,7 +1511,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
mmc_release_host(card->host); mmc_release_host(card->host);
if (err) { if (err) {
printk(KERN_ERR "%s: unable to set block size to 512: %d\n", pr_err("%s: unable to set block size to 512: %d\n",
md->disk->disk_name, err); md->disk->disk_name, err);
return -EINVAL; return -EINVAL;
} }
...@@ -1613,7 +1613,7 @@ static int mmc_blk_probe(struct mmc_card *card) ...@@ -1613,7 +1613,7 @@ static int mmc_blk_probe(struct mmc_card *card)
string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2, string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2,
cap_str, sizeof(cap_str)); cap_str, sizeof(cap_str));
printk(KERN_INFO "%s: %s %s %s %s\n", pr_info("%s: %s %s %s %s\n",
md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
cap_str, md->read_only ? "(ro)" : ""); cap_str, md->read_only ? "(ro)" : "");
......
...@@ -251,7 +251,7 @@ static int mmc_test_wait_busy(struct mmc_test_card *test) ...@@ -251,7 +251,7 @@ static int mmc_test_wait_busy(struct mmc_test_card *test)
if (!busy && mmc_test_busy(&cmd)) { if (!busy && mmc_test_busy(&cmd)) {
busy = 1; busy = 1;
if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY) if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
printk(KERN_INFO "%s: Warning: Host did not " pr_info("%s: Warning: Host did not "
"wait for busy state to end.\n", "wait for busy state to end.\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
} }
...@@ -553,7 +553,7 @@ static void mmc_test_print_rate(struct mmc_test_card *test, uint64_t bytes, ...@@ -553,7 +553,7 @@ static void mmc_test_print_rate(struct mmc_test_card *test, uint64_t bytes,
rate = mmc_test_rate(bytes, &ts); rate = mmc_test_rate(bytes, &ts);
iops = mmc_test_rate(100, &ts); /* I/O ops per sec x 100 */ iops = mmc_test_rate(100, &ts); /* I/O ops per sec x 100 */
printk(KERN_INFO "%s: Transfer of %u sectors (%u%s KiB) took %lu.%09lu " pr_info("%s: Transfer of %u sectors (%u%s KiB) took %lu.%09lu "
"seconds (%u kB/s, %u KiB/s, %u.%02u IOPS)\n", "seconds (%u kB/s, %u KiB/s, %u.%02u IOPS)\n",
mmc_hostname(test->card->host), sectors, sectors >> 1, mmc_hostname(test->card->host), sectors, sectors >> 1,
(sectors & 1 ? ".5" : ""), (unsigned long)ts.tv_sec, (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,7 +579,7 @@ static void mmc_test_print_avg_rate(struct mmc_test_card *test, uint64_t bytes,
rate = mmc_test_rate(tot, &ts); rate = mmc_test_rate(tot, &ts);
iops = mmc_test_rate(count * 100, &ts); /* I/O ops per sec x 100 */ iops = mmc_test_rate(count * 100, &ts); /* I/O ops per sec x 100 */
printk(KERN_INFO "%s: Transfer of %u x %u sectors (%u x %u%s KiB) took " pr_info("%s: Transfer of %u x %u sectors (%u x %u%s KiB) took "
"%lu.%09lu seconds (%u kB/s, %u KiB/s, " "%lu.%09lu seconds (%u kB/s, %u KiB/s, "
"%u.%02u IOPS, sg_len %d)\n", "%u.%02u IOPS, sg_len %d)\n",
mmc_hostname(test->card->host), count, sectors, count, 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,7 +1409,7 @@ static int mmc_test_multi_read_high(struct mmc_test_card *test)
static int mmc_test_no_highmem(struct mmc_test_card *test) static int mmc_test_no_highmem(struct mmc_test_card *test)
{ {
printk(KERN_INFO "%s: Highmem not configured - test skipped\n", pr_info("%s: Highmem not configured - test skipped\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
return 0; return 0;
} }
...@@ -1436,7 +1436,7 @@ static int mmc_test_area_map(struct mmc_test_card *test, unsigned long sz, ...@@ -1436,7 +1436,7 @@ static int mmc_test_area_map(struct mmc_test_card *test, unsigned long sz,
t->max_seg_sz, &t->sg_len, min_sg_len); t->max_seg_sz, &t->sg_len, min_sg_len);
} }
if (err) if (err)
printk(KERN_INFO "%s: Failed to map sg list\n", pr_info("%s: Failed to map sg list\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
return err; return err;
} }
...@@ -2136,7 +2136,7 @@ static int mmc_test_rw_multiple(struct mmc_test_card *test, ...@@ -2136,7 +2136,7 @@ static int mmc_test_rw_multiple(struct mmc_test_card *test,
return ret; return ret;
err: err:
printk(KERN_INFO "[%s] error\n", __func__); pr_info("[%s] error\n", __func__);
return ret; return ret;
} }
...@@ -2150,7 +2150,7 @@ static int mmc_test_rw_multiple_size(struct mmc_test_card *test, ...@@ -2150,7 +2150,7 @@ static int mmc_test_rw_multiple_size(struct mmc_test_card *test,
if (rw->do_nonblock_req && if (rw->do_nonblock_req &&
((!pre_req && post_req) || (pre_req && !post_req))) { ((!pre_req && post_req) || (pre_req && !post_req))) {
printk(KERN_INFO "error: only one of pre/post is defined\n"); pr_info("error: only one of pre/post is defined\n");
return -EINVAL; return -EINVAL;
} }
...@@ -2691,7 +2691,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase) ...@@ -2691,7 +2691,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
{ {
int i, ret; int i, ret;
printk(KERN_INFO "%s: Starting tests of card %s...\n", pr_info("%s: Starting tests of card %s...\n",
mmc_hostname(test->card->host), mmc_card_id(test->card)); mmc_hostname(test->card->host), mmc_card_id(test->card));
mmc_claim_host(test->card->host); mmc_claim_host(test->card->host);
...@@ -2702,14 +2702,14 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase) ...@@ -2702,14 +2702,14 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
if (testcase && ((i + 1) != testcase)) if (testcase && ((i + 1) != testcase))
continue; continue;
printk(KERN_INFO "%s: Test case %d. %s...\n", pr_info("%s: Test case %d. %s...\n",
mmc_hostname(test->card->host), i + 1, mmc_hostname(test->card->host), i + 1,
mmc_test_cases[i].name); mmc_test_cases[i].name);
if (mmc_test_cases[i].prepare) { if (mmc_test_cases[i].prepare) {
ret = mmc_test_cases[i].prepare(test); ret = mmc_test_cases[i].prepare(test);
if (ret) { if (ret) {
printk(KERN_INFO "%s: Result: Prepare " pr_info("%s: Result: Prepare "
"stage failed! (%d)\n", "stage failed! (%d)\n",
mmc_hostname(test->card->host), mmc_hostname(test->card->host),
ret); ret);
...@@ -2739,25 +2739,25 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase) ...@@ -2739,25 +2739,25 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
ret = mmc_test_cases[i].run(test); ret = mmc_test_cases[i].run(test);
switch (ret) { switch (ret) {
case RESULT_OK: case RESULT_OK:
printk(KERN_INFO "%s: Result: OK\n", pr_info("%s: Result: OK\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
break; break;
case RESULT_FAIL: case RESULT_FAIL:
printk(KERN_INFO "%s: Result: FAILED\n", pr_info("%s: Result: FAILED\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
break; break;
case RESULT_UNSUP_HOST: case RESULT_UNSUP_HOST:
printk(KERN_INFO "%s: Result: UNSUPPORTED " pr_info("%s: Result: UNSUPPORTED "
"(by host)\n", "(by host)\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
break; break;
case RESULT_UNSUP_CARD: case RESULT_UNSUP_CARD:
printk(KERN_INFO "%s: Result: UNSUPPORTED " pr_info("%s: Result: UNSUPPORTED "
"(by card)\n", "(by card)\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
break; break;
default: default:
printk(KERN_INFO "%s: Result: ERROR (%d)\n", pr_info("%s: Result: ERROR (%d)\n",
mmc_hostname(test->card->host), ret); mmc_hostname(test->card->host), ret);
} }
...@@ -2768,7 +2768,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase) ...@@ -2768,7 +2768,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
if (mmc_test_cases[i].cleanup) { if (mmc_test_cases[i].cleanup) {
ret = mmc_test_cases[i].cleanup(test); ret = mmc_test_cases[i].cleanup(test);
if (ret) { if (ret) {
printk(KERN_INFO "%s: Warning: Cleanup " pr_info("%s: Warning: Cleanup "
"stage failed! (%d)\n", "stage failed! (%d)\n",
mmc_hostname(test->card->host), mmc_hostname(test->card->host),
ret); ret);
...@@ -2778,7 +2778,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase) ...@@ -2778,7 +2778,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
mmc_release_host(test->card->host); mmc_release_host(test->card->host);
printk(KERN_INFO "%s: Tests completed.\n", pr_info("%s: Tests completed.\n",
mmc_hostname(test->card->host)); mmc_hostname(test->card->host));
} }
......
...@@ -197,13 +197,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, ...@@ -197,13 +197,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
if (bouncesz > 512) { if (bouncesz > 512) {
mqrq_cur->bounce_buf = kmalloc(bouncesz, GFP_KERNEL); mqrq_cur->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);
if (!mqrq_cur->bounce_buf) { if (!mqrq_cur->bounce_buf) {
printk(KERN_WARNING "%s: unable to " pr_warning("%s: unable to "
"allocate bounce cur buffer\n", "allocate bounce cur buffer\n",
mmc_card_name(card)); mmc_card_name(card));
} }
mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL); mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);
if (!mqrq_prev->bounce_buf) { if (!mqrq_prev->bounce_buf) {
printk(KERN_WARNING "%s: unable to " pr_warning("%s: unable to "
"allocate bounce prev buffer\n", "allocate bounce prev buffer\n",
mmc_card_name(card)); mmc_card_name(card));
kfree(mqrq_cur->bounce_buf); kfree(mqrq_cur->bounce_buf);
......
...@@ -1082,7 +1082,7 @@ static int sdio_uart_probe(struct sdio_func *func, ...@@ -1082,7 +1082,7 @@ static int sdio_uart_probe(struct sdio_func *func,
return -ENOMEM; return -ENOMEM;
if (func->class == SDIO_CLASS_UART) { if (func->class == SDIO_CLASS_UART) {
printk(KERN_WARNING "%s: need info on UART class basic setup\n", pr_warning("%s: need info on UART class basic setup\n",
sdio_func_id(func)); sdio_func_id(func));
kfree(port); kfree(port);
return -ENOSYS; return -ENOSYS;
...@@ -1101,23 +1101,23 @@ static int sdio_uart_probe(struct sdio_func *func, ...@@ -1101,23 +1101,23 @@ static int sdio_uart_probe(struct sdio_func *func,
break; break;
} }
if (!tpl) { if (!tpl) {
printk(KERN_WARNING pr_warning(
"%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n", "%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",
sdio_func_id(func)); sdio_func_id(func));
kfree(port); kfree(port);
return -EINVAL; return -EINVAL;
} }
printk(KERN_DEBUG "%s: Register ID = 0x%02x, Exp ID = 0x%02x\n", pr_debug("%s: Register ID = 0x%02x, Exp ID = 0x%02x\n",
sdio_func_id(func), tpl->data[2], tpl->data[3]); sdio_func_id(func), tpl->data[2], tpl->data[3]);
port->regs_offset = (tpl->data[4] << 0) | port->regs_offset = (tpl->data[4] << 0) |
(tpl->data[5] << 8) | (tpl->data[5] << 8) |
(tpl->data[6] << 16); (tpl->data[6] << 16);
printk(KERN_DEBUG "%s: regs offset = 0x%x\n", pr_debug("%s: regs offset = 0x%x\n",
sdio_func_id(func), port->regs_offset); sdio_func_id(func), port->regs_offset);
port->uartclk = tpl->data[7] * 115200; port->uartclk = tpl->data[7] * 115200;
if (port->uartclk == 0) if (port->uartclk == 0)
port->uartclk = 115200; port->uartclk = 115200;
printk(KERN_DEBUG "%s: clk %d baudcode %u 4800-div %u\n", pr_debug("%s: clk %d baudcode %u 4800-div %u\n",
sdio_func_id(func), port->uartclk, sdio_func_id(func), port->uartclk,
tpl->data[7], tpl->data[8] | (tpl->data[9] << 8)); tpl->data[7], tpl->data[8] | (tpl->data[9] << 8));
} else { } else {
......
...@@ -295,7 +295,7 @@ int mmc_add_card(struct mmc_card *card) ...@@ -295,7 +295,7 @@ int mmc_add_card(struct mmc_card *card)
} }
if (mmc_host_is_spi(card->host)) { 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_hostname(card->host),
mmc_card_highspeed(card) ? "high speed " : "", mmc_card_highspeed(card) ? "high speed " : "",
mmc_card_ddr_mode(card) ? "DDR " : "", mmc_card_ddr_mode(card) ? "DDR " : "",
...@@ -334,10 +334,10 @@ void mmc_remove_card(struct mmc_card *card) ...@@ -334,10 +334,10 @@ void mmc_remove_card(struct mmc_card *card)
if (mmc_card_present(card)) { if (mmc_card_present(card)) {
if (mmc_host_is_spi(card->host)) { 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)); mmc_hostname(card->host));
} else { } else {
printk(KERN_INFO "%s: card %04x removed\n", pr_info("%s: card %04x removed\n",
mmc_hostname(card->host), card->rca); mmc_hostname(card->host), card->rca);
} }
device_del(&card->dev); device_del(&card->dev);
......
...@@ -1541,7 +1541,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, ...@@ -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; cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
err = mmc_wait_for_cmd(card->host, &cmd, 0); err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) { 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]); "status %#x\n", err, cmd.resp[0]);
err = -EIO; err = -EIO;
goto out; goto out;
...@@ -1556,7 +1556,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, ...@@ -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; cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
err = mmc_wait_for_cmd(card->host, &cmd, 0); err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) { 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, cmd.resp[0]);
err = -EIO; err = -EIO;
goto out; goto out;
...@@ -1569,7 +1569,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, ...@@ -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); cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty);
err = mmc_wait_for_cmd(card->host, &cmd, 0); err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) { 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, cmd.resp[0]);
err = -EIO; err = -EIO;
goto out; goto out;
...@@ -1586,7 +1586,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, ...@@ -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 */ /* Do not retry else we can't see errors */
err = mmc_wait_for_cmd(card->host, &cmd, 0); err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err || (cmd.resp[0] & 0xFDF92000)) { 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, cmd.resp[0]);
err = -EIO; err = -EIO;
goto out; goto out;
...@@ -2177,7 +2177,7 @@ int mmc_resume_host(struct mmc_host *host) ...@@ -2177,7 +2177,7 @@ int mmc_resume_host(struct mmc_host *host)
BUG_ON(!host->bus_ops->resume); BUG_ON(!host->bus_ops->resume);
err = host->bus_ops->resume(host); err = host->bus_ops->resume(host);
if (err) { if (err) {
printk(KERN_WARNING "%s: error %d during resume " pr_warning("%s: error %d during resume "
"(card was removed?)\n", "(card was removed?)\n",
mmc_hostname(host), err); mmc_hostname(host), err);
err = 0; err = 0;
......
...@@ -101,7 +101,7 @@ static int mmc_decode_cid(struct mmc_card *card) ...@@ -101,7 +101,7 @@ static int mmc_decode_cid(struct mmc_card *card)
break; break;
default: 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); mmc_hostname(card->host), card->csd.mmca_vsn);
return -EINVAL; return -EINVAL;
} }
...@@ -135,7 +135,7 @@ static int mmc_decode_csd(struct mmc_card *card) ...@@ -135,7 +135,7 @@ static int mmc_decode_csd(struct mmc_card *card)
*/ */
csd->structure = UNSTUFF_BITS(resp, 126, 2); csd->structure = UNSTUFF_BITS(resp, 126, 2);
if (csd->structure == 0) { 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); mmc_hostname(card->host), csd->structure);
return -EINVAL; return -EINVAL;
} }
...@@ -195,7 +195,7 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd) ...@@ -195,7 +195,7 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
*/ */
ext_csd = kmalloc(512, GFP_KERNEL); ext_csd = kmalloc(512, GFP_KERNEL);
if (!ext_csd) { 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)); "receive the ext_csd.\n", mmc_hostname(card->host));
return -ENOMEM; return -ENOMEM;
} }
...@@ -217,12 +217,12 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd) ...@@ -217,12 +217,12 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd)
* stored in their CSD. * stored in their CSD.
*/ */
if (card->csd.capacity == (4096 * 512)) { 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. " "on a possible high capacity card. "
"Card will be ignored.\n", "Card will be ignored.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
} else { } else {
printk(KERN_WARNING "%s: unable to read " pr_warning("%s: unable to read "
"EXT_CSD, performance might " "EXT_CSD, performance might "
"suffer.\n", "suffer.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
...@@ -252,7 +252,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) ...@@ -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]; card->ext_csd.raw_ext_csd_structure = ext_csd[EXT_CSD_STRUCTURE];
if (card->csd.structure == 3) { if (card->csd.structure == 3) {
if (card->ext_csd.raw_ext_csd_structure > 2) { 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), "version %d\n", mmc_hostname(card->host),
card->ext_csd.raw_ext_csd_structure); card->ext_csd.raw_ext_csd_structure);
err = -EINVAL; err = -EINVAL;
...@@ -262,7 +262,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) ...@@ -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]; card->ext_csd.rev = ext_csd[EXT_CSD_REV];
if (card->ext_csd.rev > 6) { 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); mmc_hostname(card->host), card->ext_csd.rev);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
...@@ -308,7 +308,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) ...@@ -308,7 +308,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
break; break;
default: default:
/* MMC v4 spec says this cannot happen */ /* 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", "support any high-speed modes.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
} }
...@@ -857,7 +857,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, ...@@ -857,7 +857,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
goto free_card; goto free_card;
if (err) { if (err) {
printk(KERN_WARNING "%s: switch to highspeed failed\n", pr_warning("%s: switch to highspeed failed\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
err = 0; err = 0;
} else { } else {
...@@ -966,7 +966,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, ...@@ -966,7 +966,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
card->ext_csd.generic_cmd6_time); card->ext_csd.generic_cmd6_time);
} }
if (err) { 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), "failed\n", mmc_hostname(card->host),
1 << bus_width, ddr); 1 << bus_width, ddr);
goto free_card; goto free_card;
...@@ -1204,7 +1204,7 @@ int mmc_attach_mmc(struct mmc_host *host) ...@@ -1204,7 +1204,7 @@ int mmc_attach_mmc(struct mmc_host *host)
* support. * support.
*/ */
if (ocr & 0x7F) { 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", "below the defined range. These will be ignored.\n",
mmc_hostname(host)); mmc_hostname(host));
ocr &= ~0x7F; ocr &= ~0x7F;
...@@ -1243,7 +1243,7 @@ int mmc_attach_mmc(struct mmc_host *host) ...@@ -1243,7 +1243,7 @@ int mmc_attach_mmc(struct mmc_host *host)
err: err:
mmc_detach_bus(host); 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); mmc_hostname(host), err);
return err; return err;
......
...@@ -414,7 +414,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, ...@@ -414,7 +414,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
return -EBADMSG; return -EBADMSG;
} else { } else {
if (status & 0xFDFFA000) if (status & 0xFDFFA000)
printk(KERN_WARNING "%s: unexpected status %#x after " pr_warning("%s: unexpected status %#x after "
"switch", mmc_hostname(card->host), status); "switch", mmc_hostname(card->host), status);
if (status & R1_SWITCH_ERROR) if (status & R1_SWITCH_ERROR)
return -EBADMSG; return -EBADMSG;
...@@ -476,7 +476,7 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode, ...@@ -476,7 +476,7 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
else if (len == 4) else if (len == 4)
test_buf = testdata_4bit; test_buf = testdata_4bit;
else { else {
printk(KERN_ERR "%s: Invalid bus_width %d\n", pr_err("%s: Invalid bus_width %d\n",
mmc_hostname(host), len); mmc_hostname(host), len);
kfree(data_buf); kfree(data_buf);
return -EINVAL; return -EINVAL;
......
...@@ -163,7 +163,7 @@ static int mmc_decode_csd(struct mmc_card *card) ...@@ -163,7 +163,7 @@ static int mmc_decode_csd(struct mmc_card *card)
csd->erase_size = 1; csd->erase_size = 1;
break; break;
default: 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); mmc_hostname(card->host), csd_struct);
return -EINVAL; return -EINVAL;
} }
...@@ -187,7 +187,7 @@ static int mmc_decode_scr(struct mmc_card *card) ...@@ -187,7 +187,7 @@ static int mmc_decode_scr(struct mmc_card *card)
scr_struct = UNSTUFF_BITS(resp, 60, 4); scr_struct = UNSTUFF_BITS(resp, 60, 4);
if (scr_struct != 0) { 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); mmc_hostname(card->host), scr_struct);
return -EINVAL; return -EINVAL;
} }
...@@ -218,7 +218,7 @@ static int mmc_read_ssr(struct mmc_card *card) ...@@ -218,7 +218,7 @@ static int mmc_read_ssr(struct mmc_card *card)
u32 *ssr; u32 *ssr;
if (!(card->csd.cmdclass & CCC_APP_SPEC)) { 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)); "function.\n", mmc_hostname(card->host));
return 0; return 0;
} }
...@@ -229,7 +229,7 @@ static int mmc_read_ssr(struct mmc_card *card) ...@@ -229,7 +229,7 @@ static int mmc_read_ssr(struct mmc_card *card)
err = mmc_app_sd_status(card, ssr); err = mmc_app_sd_status(card, ssr);
if (err) { if (err) {
printk(KERN_WARNING "%s: problem reading SD Status " pr_warning("%s: problem reading SD Status "
"register.\n", mmc_hostname(card->host)); "register.\n", mmc_hostname(card->host));
err = 0; err = 0;
goto out; goto out;
...@@ -253,7 +253,7 @@ static int mmc_read_ssr(struct mmc_card *card) ...@@ -253,7 +253,7 @@ static int mmc_read_ssr(struct mmc_card *card)
card->ssr.erase_offset = eo * 1000; card->ssr.erase_offset = eo * 1000;
} }
} else { } else {
printk(KERN_WARNING "%s: SD Status: Invalid Allocation Unit " pr_warning("%s: SD Status: Invalid Allocation Unit "
"size.\n", mmc_hostname(card->host)); "size.\n", mmc_hostname(card->host));
} }
out: out:
...@@ -273,7 +273,7 @@ static int mmc_read_switch(struct mmc_card *card) ...@@ -273,7 +273,7 @@ static int mmc_read_switch(struct mmc_card *card)
return 0; return 0;
if (!(card->csd.cmdclass & CCC_SWITCH)) { 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", "function, performance might suffer.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
return 0; return 0;
...@@ -283,7 +283,7 @@ static int mmc_read_switch(struct mmc_card *card) ...@@ -283,7 +283,7 @@ static int mmc_read_switch(struct mmc_card *card)
status = kmalloc(64, GFP_KERNEL); status = kmalloc(64, GFP_KERNEL);
if (!status) { if (!status) {
printk(KERN_ERR "%s: could not allocate a buffer for " pr_err("%s: could not allocate a buffer for "
"switch capabilities.\n", "switch capabilities.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
return -ENOMEM; return -ENOMEM;
...@@ -299,7 +299,7 @@ static int mmc_read_switch(struct mmc_card *card) ...@@ -299,7 +299,7 @@ static int mmc_read_switch(struct mmc_card *card)
if (err != -EINVAL && err != -ENOSYS && err != -EFAULT) if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
goto out; 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)); mmc_hostname(card->host));
err = 0; err = 0;
...@@ -319,7 +319,7 @@ static int mmc_read_switch(struct mmc_card *card) ...@@ -319,7 +319,7 @@ static int mmc_read_switch(struct mmc_card *card)
if (err != -EINVAL && err != -ENOSYS && err != -EFAULT) if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
goto out; goto out;
printk(KERN_WARNING "%s: problem reading " pr_warning("%s: problem reading "
"Driver Strength.\n", "Driver Strength.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
err = 0; err = 0;
...@@ -339,7 +339,7 @@ static int mmc_read_switch(struct mmc_card *card) ...@@ -339,7 +339,7 @@ static int mmc_read_switch(struct mmc_card *card)
if (err != -EINVAL && err != -ENOSYS && err != -EFAULT) if (err != -EINVAL && err != -ENOSYS && err != -EFAULT)
goto out; goto out;
printk(KERN_WARNING "%s: problem reading " pr_warning("%s: problem reading "
"Current Limit.\n", "Current Limit.\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
err = 0; err = 0;
...@@ -383,7 +383,7 @@ int mmc_sd_switch_hs(struct mmc_card *card) ...@@ -383,7 +383,7 @@ int mmc_sd_switch_hs(struct mmc_card *card)
status = kmalloc(64, GFP_KERNEL); status = kmalloc(64, GFP_KERNEL);
if (!status) { 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)); "switch capabilities.\n", mmc_hostname(card->host));
return -ENOMEM; return -ENOMEM;
} }
...@@ -393,7 +393,7 @@ int mmc_sd_switch_hs(struct mmc_card *card) ...@@ -393,7 +393,7 @@ int mmc_sd_switch_hs(struct mmc_card *card)
goto out; goto out;
if ((status[16] & 0xF) != 1) { if ((status[16] & 0xF) != 1) {
printk(KERN_WARNING "%s: Problem switching card " pr_warning("%s: Problem switching card "
"into high-speed mode!\n", "into high-speed mode!\n",
mmc_hostname(card->host)); mmc_hostname(card->host));
err = 0; err = 0;
...@@ -459,7 +459,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status) ...@@ -459,7 +459,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
return err; return err;
if ((status[15] & 0xF) != drive_strength) { 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)); mmc_hostname(card->host));
return 0; return 0;
} }
...@@ -538,7 +538,7 @@ static int sd_set_bus_speed_mode(struct mmc_card *card, u8 *status) ...@@ -538,7 +538,7 @@ static int sd_set_bus_speed_mode(struct mmc_card *card, u8 *status)
return err; return err;
if ((status[16] & 0xF) != card->sd_bus_speed) 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)); mmc_hostname(card->host));
else { else {
mmc_set_timing(card->host, timing); mmc_set_timing(card->host, timing);
...@@ -600,7 +600,7 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status) ...@@ -600,7 +600,7 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status)
return err; return err;
if (((status[15] >> 4) & 0x0F) != current_limit) 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)); mmc_hostname(card->host));
return 0; return 0;
...@@ -622,7 +622,7 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card) ...@@ -622,7 +622,7 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
status = kmalloc(64, GFP_KERNEL); status = kmalloc(64, GFP_KERNEL);
if (!status) { 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)); "switch capabilities.\n", mmc_hostname(card->host));
return -ENOMEM; return -ENOMEM;
} }
...@@ -852,7 +852,7 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card, ...@@ -852,7 +852,7 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card,
ro = host->ops->get_ro(host); ro = host->ops->get_ro(host);
if (ro < 0) { if (ro < 0) {
printk(KERN_WARNING "%s: host does not " pr_warning("%s: host does not "
"support reading read-only " "support reading read-only "
"switch. assuming write-enable.\n", "switch. assuming write-enable.\n",
mmc_hostname(host)); mmc_hostname(host));
...@@ -1166,7 +1166,7 @@ int mmc_attach_sd(struct mmc_host *host) ...@@ -1166,7 +1166,7 @@ int mmc_attach_sd(struct mmc_host *host)
* support. * support.
*/ */
if (ocr & 0x7F) { 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", "below the defined range. These will be ignored.\n",
mmc_hostname(host)); mmc_hostname(host));
ocr &= ~0x7F; ocr &= ~0x7F;
...@@ -1174,7 +1174,7 @@ int mmc_attach_sd(struct mmc_host *host) ...@@ -1174,7 +1174,7 @@ int mmc_attach_sd(struct mmc_host *host)
if ((ocr & MMC_VDD_165_195) && if ((ocr & MMC_VDD_165_195) &&
!(host->ocr_avail_sd & 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 " "incompletely defined 'low voltage range'. This "
"will be ignored.\n", mmc_hostname(host)); "will be ignored.\n", mmc_hostname(host));
ocr &= ~MMC_VDD_165_195; ocr &= ~MMC_VDD_165_195;
...@@ -1213,7 +1213,7 @@ int mmc_attach_sd(struct mmc_host *host) ...@@ -1213,7 +1213,7 @@ int mmc_attach_sd(struct mmc_host *host)
err: err:
mmc_detach_bus(host); 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); mmc_hostname(host), err);
return err; return err;
......
...@@ -112,7 +112,7 @@ static int sdio_read_cccr(struct mmc_card *card) ...@@ -112,7 +112,7 @@ static int sdio_read_cccr(struct mmc_card *card)
cccr_vsn = data & 0x0f; cccr_vsn = data & 0x0f;
if (cccr_vsn > SDIO_CCCR_REV_1_20) { 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); mmc_hostname(card->host), cccr_vsn);
return -EINVAL; return -EINVAL;
} }
...@@ -777,7 +777,7 @@ int mmc_attach_sdio(struct mmc_host *host) ...@@ -777,7 +777,7 @@ int mmc_attach_sdio(struct mmc_host *host)
* support. * support.
*/ */
if (ocr & 0x7F) { 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", "below the defined range. These will be ignored.\n",
mmc_hostname(host)); mmc_hostname(host));
ocr &= ~0x7F; ocr &= ~0x7F;
...@@ -874,7 +874,7 @@ int mmc_attach_sdio(struct mmc_host *host) ...@@ -874,7 +874,7 @@ int mmc_attach_sdio(struct mmc_host *host)
err: err:
mmc_detach_bus(host); 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); mmc_hostname(host), err);
return err; return err;
......
...@@ -173,7 +173,7 @@ static int sdio_bus_remove(struct device *dev) ...@@ -173,7 +173,7 @@ static int sdio_bus_remove(struct device *dev)
drv->remove(func); drv->remove(func);
if (func->irq_handler) { 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); "its interrupt handler!\n", drv->name);
sdio_claim_host(func); sdio_claim_host(func);
sdio_release_irq(func); sdio_release_irq(func);
......
...@@ -132,7 +132,7 @@ static int cis_tpl_parse(struct mmc_card *card, struct sdio_func *func, ...@@ -132,7 +132,7 @@ static int cis_tpl_parse(struct mmc_card *card, struct sdio_func *func,
ret = -EINVAL; ret = -EINVAL;
} }
if (ret && ret != -EILSEQ && ret != -ENOENT) { 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); mmc_hostname(card->host), tpl_descr, code, size);
} }
} else { } else {
...@@ -313,7 +313,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func) ...@@ -313,7 +313,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
if (ret == -ENOENT) { if (ret == -ENOENT) {
/* warn about unknown tuples */ /* warn about unknown tuples */
printk(KERN_WARNING "%s: queuing unknown" pr_warning("%s: queuing unknown"
" CIS tuple 0x%02x (%u bytes)\n", " CIS tuple 0x%02x (%u bytes)\n",
mmc_hostname(card->host), mmc_hostname(card->host),
tpl_code, tpl_link); tpl_code, tpl_link);
......
...@@ -45,7 +45,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card) ...@@ -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); ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending);
if (ret) { 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); mmc_card_id(card), ret);
return ret; return ret;
} }
...@@ -55,7 +55,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card) ...@@ -55,7 +55,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
if (pending & (1 << i)) { if (pending & (1 << i)) {
func = card->sdio_func[i - 1]; func = card->sdio_func[i - 1];
if (!func) { if (!func) {
printk(KERN_WARNING "%s: pending IRQ for " pr_warning("%s: pending IRQ for "
"non-existent function\n", "non-existent function\n",
mmc_card_id(card)); mmc_card_id(card));
ret = -EINVAL; ret = -EINVAL;
...@@ -63,7 +63,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card) ...@@ -63,7 +63,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
func->irq_handler(func); func->irq_handler(func);
count++; count++;
} else { } else {
printk(KERN_WARNING "%s: pending IRQ with no handler\n", pr_warning("%s: pending IRQ with no handler\n",
sdio_func_id(func)); sdio_func_id(func));
ret = -EINVAL; ret = -EINVAL;
} }
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#ifdef DEBUG #ifdef DEBUG
#define DBG(fmt, idx, args...) \ #define DBG(fmt, idx, args...) \
printk(KERN_DEBUG "au1xmmc(%d): DEBUG: " fmt, idx, ##args) pr_debug("au1xmmc(%d): DEBUG: " fmt, idx, ##args)
#else #else
#define DBG(fmt, idx, args...) do {} while (0) #define DBG(fmt, idx, args...) do {} while (0)
#endif #endif
...@@ -268,7 +268,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait, ...@@ -268,7 +268,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
mmccmd |= SD_CMD_RT_3; mmccmd |= SD_CMD_RT_3;
break; break;
default: default:
printk(KERN_INFO "au1xmmc: unhandled response type %02x\n", pr_info("au1xmmc: unhandled response type %02x\n",
mmc_resp_type(cmd)); mmc_resp_type(cmd));
return -EINVAL; return -EINVAL;
} }
...@@ -1031,7 +1031,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev) ...@@ -1031,7 +1031,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
#ifdef CONFIG_SOC_AU1200 #ifdef CONFIG_SOC_AU1200
ret = au1xmmc_dbdma_init(host); ret = au1xmmc_dbdma_init(host);
if (ret) if (ret)
printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; using PIO\n"); pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
#endif #endif
#ifdef CONFIG_LEDS_CLASS #ifdef CONFIG_LEDS_CLASS
...@@ -1056,7 +1056,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev) ...@@ -1056,7 +1056,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);
printk(KERN_INFO DRIVER_NAME ": MMC Controller %d set up at %8.8X" pr_info(DRIVER_NAME ": MMC Controller %d set up at %8.8X"
" (mode=%s)\n", pdev->id, host->iobase, " (mode=%s)\n", pdev->id, host->iobase,
host->flags & HOST_F_DMA ? "dma" : "pio"); host->flags & HOST_F_DMA ? "dma" : "pio");
...@@ -1188,7 +1188,7 @@ static int __init au1xmmc_init(void) ...@@ -1188,7 +1188,7 @@ static int __init au1xmmc_init(void)
*/ */
memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev); memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
if (!memid) if (!memid)
printk(KERN_ERR "au1xmmc: cannot add memory dbdma dev\n"); pr_err("au1xmmc: cannot add memory dbdma dev\n");
#endif #endif
return platform_driver_register(&au1xmmc_driver); return platform_driver_register(&au1xmmc_driver);
} }
......
...@@ -1701,7 +1701,7 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) ...@@ -1701,7 +1701,7 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
if (IS_ERR(host->vmmc)) { if (IS_ERR(host->vmmc)) {
printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc)); pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc));
host->vmmc = NULL; host->vmmc = NULL;
} else } else
regulator_enable(host->vmmc); regulator_enable(host->vmmc);
......
...@@ -942,7 +942,7 @@ static int __init imxmci_probe(struct platform_device *pdev) ...@@ -942,7 +942,7 @@ static int __init imxmci_probe(struct platform_device *pdev)
int ret = 0, irq; int ret = 0, irq;
u16 rev_no; u16 rev_no;
printk(KERN_INFO "i.MX mmc driver\n"); pr_info("i.MX mmc driver\n");
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
......
...@@ -464,7 +464,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data) ...@@ -464,7 +464,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
struct mmci_host_next *next = &host->next_data; struct mmci_host_next *next = &host->next_data;
if (data->host_cookie && data->host_cookie != next->cookie) { if (data->host_cookie && data->host_cookie != next->cookie) {
printk(KERN_WARNING "[%s] invalid cookie: data->host_cookie %d" pr_warning("[%s] invalid cookie: data->host_cookie %d"
" host->next_data.cookie %d\n", " host->next_data.cookie %d\n",
__func__, data->host_cookie, host->next_data.cookie); __func__, data->host_cookie, host->next_data.cookie);
data->host_cookie = 0; data->host_cookie = 0;
......
...@@ -389,7 +389,7 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data) ...@@ -389,7 +389,7 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data)
n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg, n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg,
host->dma.num_ents, host->dma.dir); host->dma.num_ents, host->dma.dir);
if (n == 0) { if (n == 0) {
printk(KERN_ERR "%s: Unable to map in all sg elements\n", pr_err("%s: Unable to map in all sg elements\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
host->dma.sg = NULL; host->dma.sg = NULL;
host->dma.num_ents = 0; host->dma.num_ents = 0;
...@@ -475,7 +475,7 @@ msmsdcc_start_command_deferred(struct msmsdcc_host *host, ...@@ -475,7 +475,7 @@ msmsdcc_start_command_deferred(struct msmsdcc_host *host,
*c |= MCI_CSPM_MCIABORT; *c |= MCI_CSPM_MCIABORT;
if (host->curr.cmd != NULL) { if (host->curr.cmd != NULL) {
printk(KERN_ERR "%s: Overlapping command requests\n", pr_err("%s: Overlapping command requests\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
} }
host->curr.cmd = cmd; host->curr.cmd = cmd;
...@@ -1113,7 +1113,7 @@ msmsdcc_platform_status_irq(int irq, void *dev_id) ...@@ -1113,7 +1113,7 @@ msmsdcc_platform_status_irq(int irq, void *dev_id)
{ {
struct msmsdcc_host *host = dev_id; struct msmsdcc_host *host = dev_id;
printk(KERN_DEBUG "%s: %d\n", __func__, irq); pr_debug("%s: %d\n", __func__, irq);
msmsdcc_check_status((unsigned long) host); msmsdcc_check_status((unsigned long) host);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -1123,7 +1123,7 @@ msmsdcc_status_notify_cb(int card_present, void *dev_id) ...@@ -1123,7 +1123,7 @@ msmsdcc_status_notify_cb(int card_present, void *dev_id)
{ {
struct msmsdcc_host *host = dev_id; struct msmsdcc_host *host = dev_id;
printk(KERN_DEBUG "%s: card_present %d\n", mmc_hostname(host->mmc), pr_debug("%s: card_present %d\n", mmc_hostname(host->mmc),
card_present); card_present);
msmsdcc_check_status((unsigned long) host); msmsdcc_check_status((unsigned long) host);
} }
......
...@@ -117,7 +117,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) ...@@ -117,7 +117,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
host->pio_size = data->blocks * data->blksz; host->pio_size = data->blocks * data->blksz;
host->pio_ptr = sg_virt(data->sg); host->pio_ptr = sg_virt(data->sg);
if (!nodma) if (!nodma)
printk(KERN_DEBUG "%s: fallback to PIO for data " pr_debug("%s: fallback to PIO for data "
"at 0x%p size %d\n", "at 0x%p size %d\n",
mmc_hostname(host->mmc), mmc_hostname(host->mmc),
host->pio_ptr, host->pio_size); host->pio_ptr, host->pio_size);
...@@ -471,7 +471,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev) ...@@ -471,7 +471,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
if (mrq->data) if (mrq->data)
err_status = mvsd_finish_data(host, mrq->data, err_status); err_status = mvsd_finish_data(host, mrq->data, err_status);
if (err_status) { if (err_status) {
printk(KERN_ERR "%s: unhandled error status %#04x\n", pr_err("%s: unhandled error status %#04x\n",
mmc_hostname(host->mmc), err_status); mmc_hostname(host->mmc), err_status);
cmd->error = -ENOMSG; cmd->error = -ENOMSG;
} }
...@@ -489,7 +489,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev) ...@@ -489,7 +489,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
if (irq_handled) if (irq_handled)
return IRQ_HANDLED; return IRQ_HANDLED;
printk(KERN_ERR "%s: unhandled interrupt status=0x%04x en=0x%04x " pr_err("%s: unhandled interrupt status=0x%04x en=0x%04x "
"pio=%d\n", mmc_hostname(host->mmc), intr_status, "pio=%d\n", mmc_hostname(host->mmc), intr_status,
host->intr_en, host->pio_size); host->intr_en, host->pio_size);
return IRQ_NONE; return IRQ_NONE;
...@@ -505,9 +505,9 @@ static void mvsd_timeout_timer(unsigned long data) ...@@ -505,9 +505,9 @@ static void mvsd_timeout_timer(unsigned long data)
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
mrq = host->mrq; mrq = host->mrq;
if (mrq) { if (mrq) {
printk(KERN_ERR "%s: Timeout waiting for hardware interrupt.\n", pr_err("%s: Timeout waiting for hardware interrupt.\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
printk(KERN_ERR "%s: hw_state=0x%04x, intr_status=0x%04x " pr_err("%s: hw_state=0x%04x, intr_status=0x%04x "
"intr_en=0x%04x\n", mmc_hostname(host->mmc), "intr_en=0x%04x\n", mmc_hostname(host->mmc),
mvsd_read(MVSD_HW_STATE), mvsd_read(MVSD_HW_STATE),
mvsd_read(MVSD_NOR_INTR_STATUS), mvsd_read(MVSD_NOR_INTR_STATUS),
...@@ -762,7 +762,7 @@ static int __init mvsd_probe(struct platform_device *pdev) ...@@ -762,7 +762,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
ret = request_irq(irq, mvsd_irq, 0, DRIVER_NAME, host); ret = request_irq(irq, mvsd_irq, 0, DRIVER_NAME, host);
if (ret) { if (ret) {
printk(KERN_ERR "%s: cannot assign irq %d\n", DRIVER_NAME, irq); pr_err("%s: cannot assign irq %d\n", DRIVER_NAME, irq);
goto out; goto out;
} else } else
host->irq = irq; host->irq = irq;
...@@ -802,7 +802,7 @@ static int __init mvsd_probe(struct platform_device *pdev) ...@@ -802,7 +802,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
if (ret) if (ret)
goto out; goto out;
printk(KERN_NOTICE "%s: %s driver initialized, ", pr_notice("%s: %s driver initialized, ",
mmc_hostname(mmc), DRIVER_NAME); mmc_hostname(mmc), DRIVER_NAME);
if (host->gpio_card_detect) if (host->gpio_card_detect)
printk("using GPIO %d for card detection\n", printk("using GPIO %d for card detection\n",
......
...@@ -842,7 +842,7 @@ static int mxcmci_probe(struct platform_device *pdev) ...@@ -842,7 +842,7 @@ static int mxcmci_probe(struct platform_device *pdev)
int ret = 0, irq; int ret = 0, irq;
dma_cap_mask_t mask; dma_cap_mask_t mask;
printk(KERN_INFO "i.MX SDHC driver\n"); pr_info("i.MX SDHC driver\n");
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
......
...@@ -1264,14 +1264,14 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host) ...@@ -1264,14 +1264,14 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host)
host->reqs_blocked = 0; host->reqs_blocked = 0;
if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) { if (mmc_slot(host).get_cover_state(host->dev, host->slot_id)) {
if (host->protect_card) { if (host->protect_card) {
printk(KERN_INFO "%s: cover is closed, " pr_info("%s: cover is closed, "
"card is now accessible\n", "card is now accessible\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
host->protect_card = 0; host->protect_card = 0;
} }
} else { } else {
if (!host->protect_card) { if (!host->protect_card) {
printk(KERN_INFO "%s: cover is open, " pr_info"%s: cover is open, "
"card is now inaccessible\n", "card is now inaccessible\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
host->protect_card = 1; host->protect_card = 1;
...@@ -1422,7 +1422,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host, ...@@ -1422,7 +1422,7 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host,
if (!next && data->host_cookie && if (!next && data->host_cookie &&
data->host_cookie != host->next_data.cookie) { data->host_cookie != host->next_data.cookie) {
printk(KERN_WARNING "[%s] invalid cookie: data->host_cookie %d" pr_warning("[%s] invalid cookie: data->host_cookie %d"
" host->next_data.cookie %d\n", " host->next_data.cookie %d\n",
__func__, data->host_cookie, host->next_data.cookie); __func__, data->host_cookie, host->next_data.cookie);
data->host_cookie = 0; data->host_cookie = 0;
......
...@@ -558,7 +558,7 @@ static void pxamci_dma_irq(int dma, void *devid) ...@@ -558,7 +558,7 @@ static void pxamci_dma_irq(int dma, void *devid)
if (dcsr & DCSR_ENDINTR) { if (dcsr & DCSR_ENDINTR) {
writel(BUF_PART_FULL, host->base + MMC_PRTBUF); writel(BUF_PART_FULL, host->base + MMC_PRTBUF);
} else { } else {
printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n", pr_err("%s: DMA error on channel %d (DCSR=%#x)\n",
mmc_hostname(host->mmc), dma, dcsr); mmc_hostname(host->mmc), dma, dcsr);
host->data->error = -EIO; host->data->error = -EIO;
pxamci_data_done(host, 0); pxamci_data_done(host, 0);
......
...@@ -247,7 +247,7 @@ static void s3cmci_check_sdio_irq(struct s3cmci_host *host) ...@@ -247,7 +247,7 @@ static void s3cmci_check_sdio_irq(struct s3cmci_host *host)
{ {
if (host->sdio_irqen) { if (host->sdio_irqen) {
if (gpio_get_value(S3C2410_GPE(8)) == 0) { if (gpio_get_value(S3C2410_GPE(8)) == 0) {
printk(KERN_DEBUG "%s: signalling irq\n", __func__); pr_debug("%s: signalling irq\n", __func__);
mmc_signal_sdio_irq(host->mmc); mmc_signal_sdio_irq(host->mmc);
} }
} }
...@@ -344,7 +344,7 @@ static void s3cmci_disable_irq(struct s3cmci_host *host, bool transfer) ...@@ -344,7 +344,7 @@ static void s3cmci_disable_irq(struct s3cmci_host *host, bool transfer)
local_irq_save(flags); local_irq_save(flags);
//printk(KERN_DEBUG "%s: transfer %d\n", __func__, transfer); /* pr_debug("%s: transfer %d\n", __func__, transfer); */
host->irq_disabled = transfer; host->irq_disabled = transfer;
......
This diff is collapsed.
...@@ -632,7 +632,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -632,7 +632,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
} }
if (host->req) { if (host->req) {
printk(KERN_ERR "%s : unfinished request detected\n", pr_err("%s : unfinished request detected\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
mrq->cmd->error = -ETIMEDOUT; mrq->cmd->error = -ETIMEDOUT;
goto err_out; goto err_out;
...@@ -672,7 +672,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -672,7 +672,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
r_data->flags & MMC_DATA_WRITE r_data->flags & MMC_DATA_WRITE
? PCI_DMA_TODEVICE ? PCI_DMA_TODEVICE
: PCI_DMA_FROMDEVICE)) { : PCI_DMA_FROMDEVICE)) {
printk(KERN_ERR "%s : scatterlist map failed\n", pr_err("%s : scatterlist map failed\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
mrq->cmd->error = -ENOMEM; mrq->cmd->error = -ENOMEM;
goto err_out; goto err_out;
...@@ -684,7 +684,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -684,7 +684,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
? PCI_DMA_TODEVICE ? PCI_DMA_TODEVICE
: PCI_DMA_FROMDEVICE); : PCI_DMA_FROMDEVICE);
if (host->sg_len < 1) { if (host->sg_len < 1) {
printk(KERN_ERR "%s : scatterlist map failed\n", pr_err("%s : scatterlist map failed\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
tifm_unmap_sg(sock, &host->bounce_buf, 1, tifm_unmap_sg(sock, &host->bounce_buf, 1,
r_data->flags & MMC_DATA_WRITE r_data->flags & MMC_DATA_WRITE
...@@ -748,7 +748,7 @@ static void tifm_sd_end_cmd(unsigned long data) ...@@ -748,7 +748,7 @@ static void tifm_sd_end_cmd(unsigned long data)
host->req = NULL; host->req = NULL;
if (!mrq) { if (!mrq) {
printk(KERN_ERR " %s : no request to complete?\n", pr_err(" %s : no request to complete?\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
spin_unlock_irqrestore(&sock->lock, flags); spin_unlock_irqrestore(&sock->lock, flags);
return; return;
...@@ -787,8 +787,7 @@ static void tifm_sd_abort(unsigned long data) ...@@ -787,8 +787,7 @@ static void tifm_sd_abort(unsigned long data)
{ {
struct tifm_sd *host = (struct tifm_sd*)data; struct tifm_sd *host = (struct tifm_sd*)data;
printk(KERN_ERR pr_err("%s : card failed to respond for a long period of time "
"%s : card failed to respond for a long period of time "
"(%x, %x)\n", "(%x, %x)\n",
dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags); dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags);
...@@ -906,7 +905,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host) ...@@ -906,7 +905,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
} }
if (rc) { if (rc) {
printk(KERN_ERR "%s : controller failed to reset\n", pr_err("%s : controller failed to reset\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
return -ENODEV; return -ENODEV;
} }
...@@ -932,8 +931,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host) ...@@ -932,8 +931,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
} }
if (rc) { if (rc) {
printk(KERN_ERR pr_err("%s : card not ready - probe failed on initialization\n",
"%s : card not ready - probe failed on initialization\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
return -ENODEV; return -ENODEV;
} }
...@@ -954,7 +952,7 @@ static int tifm_sd_probe(struct tifm_dev *sock) ...@@ -954,7 +952,7 @@ static int tifm_sd_probe(struct tifm_dev *sock)
if (!(TIFM_SOCK_STATE_OCCUPIED if (!(TIFM_SOCK_STATE_OCCUPIED
& readl(sock->addr + SOCK_PRESENT_STATE))) { & readl(sock->addr + SOCK_PRESENT_STATE))) {
printk(KERN_WARNING "%s : card gone, unexpectedly\n", pr_warning("%s : card gone, unexpectedly\n",
dev_name(&sock->dev)); dev_name(&sock->dev));
return rc; return rc;
} }
......
...@@ -92,7 +92,7 @@ static int tmio_mmc_next_sg(struct tmio_mmc_host *host) ...@@ -92,7 +92,7 @@ static int tmio_mmc_next_sg(struct tmio_mmc_host *host)
static void pr_debug_status(u32 status) static void pr_debug_status(u32 status)
{ {
int i = 0; int i = 0;
printk(KERN_DEBUG "status: %08x = ", status); pr_debug("status: %08x = ", status);
STATUS_TO_TEXT(CARD_REMOVE, status, i); STATUS_TO_TEXT(CARD_REMOVE, status, i);
STATUS_TO_TEXT(CARD_INSERT, status, i); STATUS_TO_TEXT(CARD_INSERT, status, i);
STATUS_TO_TEXT(SIGSTATE, status, i); STATUS_TO_TEXT(SIGSTATE, status, i);
......
...@@ -1192,7 +1192,7 @@ static void __devexit via_sd_remove(struct pci_dev *pcidev) ...@@ -1192,7 +1192,7 @@ static void __devexit via_sd_remove(struct pci_dev *pcidev)
mmiowb(); mmiowb();
if (sdhost->mrq) { if (sdhost->mrq) {
printk(KERN_ERR "%s: Controller removed during " pr_err("%s: Controller removed during "
"transfer\n", mmc_hostname(sdhost->mmc)); "transfer\n", mmc_hostname(sdhost->mmc));
/* make sure all DMA is stopped */ /* make sure all DMA is stopped */
......
...@@ -194,7 +194,7 @@ static void wbsd_reset(struct wbsd_host *host) ...@@ -194,7 +194,7 @@ static void wbsd_reset(struct wbsd_host *host)
{ {
u8 setup; u8 setup;
printk(KERN_ERR "%s: Resetting chip\n", mmc_hostname(host->mmc)); pr_err("%s: Resetting chip\n", mmc_hostname(host->mmc));
/* /*
* Soft reset of chip (SD/MMC part). * 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,7 +721,7 @@ static void wbsd_finish_data(struct wbsd_host *host, struct mmc_data *data)
* Any leftover data? * Any leftover data?
*/ */
if (count) { if (count) {
printk(KERN_ERR "%s: Incomplete DMA transfer. " pr_err("%s: Incomplete DMA transfer. "
"%d bytes left.\n", "%d bytes left.\n",
mmc_hostname(host->mmc), count); mmc_hostname(host->mmc), count);
...@@ -803,7 +803,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -803,7 +803,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
default: default:
#ifdef CONFIG_MMC_DEBUG #ifdef CONFIG_MMC_DEBUG
printk(KERN_WARNING "%s: Data command %d is not " pr_warning("%s: Data command %d is not "
"supported by this controller.\n", "supported by this controller.\n",
mmc_hostname(host->mmc), cmd->opcode); mmc_hostname(host->mmc), cmd->opcode);
#endif #endif
...@@ -1029,7 +1029,7 @@ static void wbsd_tasklet_card(unsigned long param) ...@@ -1029,7 +1029,7 @@ static void wbsd_tasklet_card(unsigned long param)
host->flags &= ~WBSD_FCARD_PRESENT; host->flags &= ~WBSD_FCARD_PRESENT;
if (host->mrq) { if (host->mrq) {
printk(KERN_ERR "%s: Card removed during transfer!\n", pr_err("%s: Card removed during transfer!\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
wbsd_reset(host); wbsd_reset(host);
...@@ -1429,7 +1429,7 @@ static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma) ...@@ -1429,7 +1429,7 @@ static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma)
free_dma(dma); free_dma(dma);
err: err:
printk(KERN_WARNING DRIVER_NAME ": Unable to allocate DMA %d. " pr_warning(DRIVER_NAME ": Unable to allocate DMA %d. "
"Falling back on FIFO.\n", dma); "Falling back on FIFO.\n", dma);
} }
...@@ -1664,7 +1664,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, ...@@ -1664,7 +1664,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
ret = wbsd_scan(host); ret = wbsd_scan(host);
if (ret) { if (ret) {
if (pnp && (ret == -ENODEV)) { if (pnp && (ret == -ENODEV)) {
printk(KERN_WARNING DRIVER_NAME pr_warning(DRIVER_NAME
": Unable to confirm device presence. You may " ": Unable to confirm device presence. You may "
"experience lock-ups.\n"); "experience lock-ups.\n");
} else { } else {
...@@ -1688,7 +1688,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, ...@@ -1688,7 +1688,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
*/ */
if (pnp) { if (pnp) {
if ((host->config != 0) && !wbsd_chip_validate(host)) { if ((host->config != 0) && !wbsd_chip_validate(host)) {
printk(KERN_WARNING DRIVER_NAME pr_warning(DRIVER_NAME
": PnP active but chip not configured! " ": PnP active but chip not configured! "
"You probably have a buggy BIOS. " "You probably have a buggy BIOS. "
"Configuring chip manually.\n"); "Configuring chip manually.\n");
...@@ -1720,7 +1720,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, ...@@ -1720,7 +1720,7 @@ static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma,
mmc_add_host(mmc); mmc_add_host(mmc);
printk(KERN_INFO "%s: W83L51xD", mmc_hostname(mmc)); pr_info("%s: W83L51xD", mmc_hostname(mmc));
if (host->chip_id != 0) if (host->chip_id != 0)
printk(" id %x", (int)host->chip_id); printk(" id %x", (int)host->chip_id);
printk(" at 0x%x irq %d", (int)host->base, (int)host->irq); 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,7 +1909,7 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
*/ */
if (host->config != 0) { if (host->config != 0) {
if (!wbsd_chip_validate(host)) { if (!wbsd_chip_validate(host)) {
printk(KERN_WARNING DRIVER_NAME pr_warning(DRIVER_NAME
": PnP active but chip not configured! " ": PnP active but chip not configured! "
"You probably have a buggy BIOS. " "You probably have a buggy BIOS. "
"Configuring chip manually.\n"); "Configuring chip manually.\n");
...@@ -1973,9 +1973,9 @@ static int __init wbsd_drv_init(void) ...@@ -1973,9 +1973,9 @@ static int __init wbsd_drv_init(void)
{ {
int result; int result;
printk(KERN_INFO DRIVER_NAME pr_info(DRIVER_NAME
": Winbond W83L51xD SD/MMC card interface driver\n"); ": Winbond W83L51xD SD/MMC card interface driver\n");
printk(KERN_INFO DRIVER_NAME ": Copyright(c) Pierre Ossman\n"); pr_info(DRIVER_NAME ": Copyright(c) Pierre Ossman\n");
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment