aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2017-01-08 14:56:48 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2017-02-13 07:20:10 -0500
commit7200449dc6a1f4556ad5da20df031bfbaf42fff5 (patch)
tree9d583b90c294696db228042bc86e98cef05bb971
parentfda02ea814f92d11a2400ec583b4d83cbb633ad0 (diff)
mmc: mmc_test: Combine substrings for 5 messages
The script "checkpatch.pl" pointed information out like the following. WARNING: quoted string split across lines Thus fix affected source code places. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/mmc_test.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index c4fc2649cb34..5c74fb4dfee6 100644
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -277,8 +277,7 @@ static int mmc_test_wait_busy(struct mmc_test_card *test)
277 if (!busy && mmc_test_busy(&cmd)) { 277 if (!busy && mmc_test_busy(&cmd)) {
278 busy = 1; 278 busy = 1;
279 if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY) 279 if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
280 pr_info("%s: Warning: Host did not " 280 pr_info("%s: Warning: Host did not wait for busy state to end.\n",
281 "wait for busy state to end.\n",
282 mmc_hostname(test->card->host)); 281 mmc_hostname(test->card->host));
283 } 282 }
284 } while (mmc_test_busy(&cmd)); 283 } while (mmc_test_busy(&cmd));
@@ -2967,8 +2966,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
2967 if (mmc_test_cases[i].prepare) { 2966 if (mmc_test_cases[i].prepare) {
2968 ret = mmc_test_cases[i].prepare(test); 2967 ret = mmc_test_cases[i].prepare(test);
2969 if (ret) { 2968 if (ret) {
2970 pr_info("%s: Result: Prepare " 2969 pr_info("%s: Result: Prepare stage failed! (%d)\n",
2971 "stage failed! (%d)\n",
2972 mmc_hostname(test->card->host), 2970 mmc_hostname(test->card->host),
2973 ret); 2971 ret);
2974 continue; 2972 continue;
@@ -3005,13 +3003,11 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
3005 mmc_hostname(test->card->host)); 3003 mmc_hostname(test->card->host));
3006 break; 3004 break;
3007 case RESULT_UNSUP_HOST: 3005 case RESULT_UNSUP_HOST:
3008 pr_info("%s: Result: UNSUPPORTED " 3006 pr_info("%s: Result: UNSUPPORTED (by host)\n",
3009 "(by host)\n",
3010 mmc_hostname(test->card->host)); 3007 mmc_hostname(test->card->host));
3011 break; 3008 break;
3012 case RESULT_UNSUP_CARD: 3009 case RESULT_UNSUP_CARD:
3013 pr_info("%s: Result: UNSUPPORTED " 3010 pr_info("%s: Result: UNSUPPORTED (by card)\n",
3014 "(by card)\n",
3015 mmc_hostname(test->card->host)); 3011 mmc_hostname(test->card->host));
3016 break; 3012 break;
3017 default: 3013 default:
@@ -3026,8 +3022,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
3026 if (mmc_test_cases[i].cleanup) { 3022 if (mmc_test_cases[i].cleanup) {
3027 ret = mmc_test_cases[i].cleanup(test); 3023 ret = mmc_test_cases[i].cleanup(test);
3028 if (ret) { 3024 if (ret) {
3029 pr_info("%s: Warning: Cleanup " 3025 pr_info("%s: Warning: Cleanup stage failed! (%d)\n",
3030 "stage failed! (%d)\n",
3031 mmc_hostname(test->card->host), 3026 mmc_hostname(test->card->host),
3032 ret); 3027 ret);
3033 } 3028 }