]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mmc: mmc_test: Combine substrings for 5 messages
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 8 Jan 2017 19:56:48 +0000 (20:56 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 13 Feb 2017 12:20:10 +0000 (13:20 +0100)
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>
drivers/mmc/core/mmc_test.c

index c4fc2649cb34f2c5cd716ae160bb4acba9d8a7de..5c74fb4dfee65cafcbe9b0af206c3847e5578658 100644 (file)
@@ -277,8 +277,7 @@ static int mmc_test_wait_busy(struct mmc_test_card *test)
                if (!busy && mmc_test_busy(&cmd)) {
                        busy = 1;
                        if (test->card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
-                               pr_info("%s: Warning: Host did not "
-                                       "wait for busy state to end.\n",
+                               pr_info("%s: Warning: Host did not wait for busy state to end.\n",
                                        mmc_hostname(test->card->host));
                }
        } while (mmc_test_busy(&cmd));
@@ -2967,8 +2966,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
                if (mmc_test_cases[i].prepare) {
                        ret = mmc_test_cases[i].prepare(test);
                        if (ret) {
-                               pr_info("%s: Result: Prepare "
-                                       "stage failed! (%d)\n",
+                               pr_info("%s: Result: Prepare stage failed! (%d)\n",
                                        mmc_hostname(test->card->host),
                                        ret);
                                continue;
@@ -3005,13 +3003,11 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
                                mmc_hostname(test->card->host));
                        break;
                case RESULT_UNSUP_HOST:
-                       pr_info("%s: Result: UNSUPPORTED "
-                               "(by host)\n",
+                       pr_info("%s: Result: UNSUPPORTED (by host)\n",
                                mmc_hostname(test->card->host));
                        break;
                case RESULT_UNSUP_CARD:
-                       pr_info("%s: Result: UNSUPPORTED "
-                               "(by card)\n",
+                       pr_info("%s: Result: UNSUPPORTED (by card)\n",
                                mmc_hostname(test->card->host));
                        break;
                default:
@@ -3026,8 +3022,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase)
                if (mmc_test_cases[i].cleanup) {
                        ret = mmc_test_cases[i].cleanup(test);
                        if (ret) {
-                               pr_info("%s: Warning: Cleanup "
-                                       "stage failed! (%d)\n",
+                               pr_info("%s: Warning: Cleanup stage failed! (%d)\n",
                                        mmc_hostname(test->card->host),
                                        ret);
                        }