diff options
author | Girish K S <girish.shivananjappa@linaro.org> | 2011-10-11 02:14:09 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-10-26 16:32:22 -0400 |
commit | a3c76eb9d4a1e68a69dd880cf0bcb8a52418b993 (patch) | |
tree | 968fb0009edad3defcda8bb40df21837868705dd /drivers/mmc/card/mmc_test.c | |
parent | b23cf0bd55b0c6b703982446f679e00d6d929524 (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/mmc/card/mmc_test.c')
-rw-r--r-- | drivers/mmc/card/mmc_test.c | 34 |
1 files changed, 17 insertions, 17 deletions
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 | ||
1410 | static int mmc_test_no_highmem(struct mmc_test_card *test) | 1410 | static 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 | ||