diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2017-01-08 14:25:39 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-02-13 07:20:09 -0500 |
commit | fda02ea814f92d11a2400ec583b4d83cbb633ad0 (patch) | |
tree | 30cb7aa59c0c2e46276a782be224d702977f8d0b /drivers/mmc/core/mmc_test.c | |
parent | dc3a5fe6ec115ee1d9d1c2ee8004c9a5193b2435 (diff) |
mmc: mmc_test: Add some spaces for better code readability
Use space characters at some source code places according to
the Linux coding style convention.
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>
Diffstat (limited to 'drivers/mmc/core/mmc_test.c')
-rw-r--r-- | drivers/mmc/core/mmc_test.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index 1641b863c3c7..c4fc2649cb34 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c | |||
@@ -641,11 +641,11 @@ static int __mmc_test_prepare(struct mmc_test_card *test, int write) | |||
641 | if (write) | 641 | if (write) |
642 | memset(test->buffer, 0xDF, 512); | 642 | memset(test->buffer, 0xDF, 512); |
643 | else { | 643 | else { |
644 | for (i = 0;i < 512;i++) | 644 | for (i = 0; i < 512; i++) |
645 | test->buffer[i] = i; | 645 | test->buffer[i] = i; |
646 | } | 646 | } |
647 | 647 | ||
648 | for (i = 0;i < BUFFER_SIZE / 512;i++) { | 648 | for (i = 0; i < BUFFER_SIZE / 512; i++) { |
649 | ret = mmc_test_buffer_transfer(test, test->buffer, i, 512, 1); | 649 | ret = mmc_test_buffer_transfer(test, test->buffer, i, 512, 1); |
650 | if (ret) | 650 | if (ret) |
651 | return ret; | 651 | return ret; |
@@ -674,7 +674,7 @@ static int mmc_test_cleanup(struct mmc_test_card *test) | |||
674 | 674 | ||
675 | memset(test->buffer, 0, 512); | 675 | memset(test->buffer, 0, 512); |
676 | 676 | ||
677 | for (i = 0;i < BUFFER_SIZE / 512;i++) { | 677 | for (i = 0; i < BUFFER_SIZE / 512; i++) { |
678 | ret = mmc_test_buffer_transfer(test, test->buffer, i, 512, 1); | 678 | ret = mmc_test_buffer_transfer(test, test->buffer, i, 512, 1); |
679 | if (ret) | 679 | if (ret) |
680 | return ret; | 680 | return ret; |
@@ -946,7 +946,7 @@ static int mmc_test_transfer(struct mmc_test_card *test, | |||
946 | unsigned long flags; | 946 | unsigned long flags; |
947 | 947 | ||
948 | if (write) { | 948 | if (write) { |
949 | for (i = 0;i < blocks * blksz;i++) | 949 | for (i = 0; i < blocks * blksz; i++) |
950 | test->scratch[i] = i; | 950 | test->scratch[i] = i; |
951 | } else { | 951 | } else { |
952 | memset(test->scratch, 0, BUFFER_SIZE); | 952 | memset(test->scratch, 0, BUFFER_SIZE); |
@@ -980,7 +980,7 @@ static int mmc_test_transfer(struct mmc_test_card *test, | |||
980 | 980 | ||
981 | memset(test->buffer, 0, sectors * 512); | 981 | memset(test->buffer, 0, sectors * 512); |
982 | 982 | ||
983 | for (i = 0;i < sectors;i++) { | 983 | for (i = 0; i < sectors; i++) { |
984 | ret = mmc_test_buffer_transfer(test, | 984 | ret = mmc_test_buffer_transfer(test, |
985 | test->buffer + i * 512, | 985 | test->buffer + i * 512, |
986 | dev_addr + i, 512, 0); | 986 | dev_addr + i, 512, 0); |
@@ -988,12 +988,12 @@ static int mmc_test_transfer(struct mmc_test_card *test, | |||
988 | return ret; | 988 | return ret; |
989 | } | 989 | } |
990 | 990 | ||
991 | for (i = 0;i < blocks * blksz;i++) { | 991 | for (i = 0; i < blocks * blksz; i++) { |
992 | if (test->buffer[i] != (u8)i) | 992 | if (test->buffer[i] != (u8)i) |
993 | return RESULT_FAIL; | 993 | return RESULT_FAIL; |
994 | } | 994 | } |
995 | 995 | ||
996 | for (;i < sectors * 512;i++) { | 996 | for (; i < sectors * 512; i++) { |
997 | if (test->buffer[i] != 0xDF) | 997 | if (test->buffer[i] != 0xDF) |
998 | return RESULT_FAIL; | 998 | return RESULT_FAIL; |
999 | } | 999 | } |
@@ -1001,7 +1001,7 @@ static int mmc_test_transfer(struct mmc_test_card *test, | |||
1001 | local_irq_save(flags); | 1001 | local_irq_save(flags); |
1002 | sg_copy_to_buffer(sg, sg_len, test->scratch, BUFFER_SIZE); | 1002 | sg_copy_to_buffer(sg, sg_len, test->scratch, BUFFER_SIZE); |
1003 | local_irq_restore(flags); | 1003 | local_irq_restore(flags); |
1004 | for (i = 0;i < blocks * blksz;i++) { | 1004 | for (i = 0; i < blocks * blksz; i++) { |
1005 | if (test->scratch[i] != (u8)i) | 1005 | if (test->scratch[i] != (u8)i) |
1006 | return RESULT_FAIL; | 1006 | return RESULT_FAIL; |
1007 | } | 1007 | } |
@@ -1086,7 +1086,7 @@ static int mmc_test_multi_write(struct mmc_test_card *test) | |||
1086 | 1086 | ||
1087 | sg_init_one(&sg, test->buffer, size); | 1087 | sg_init_one(&sg, test->buffer, size); |
1088 | 1088 | ||
1089 | return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1); | 1089 | return mmc_test_transfer(test, &sg, 1, 0, size / 512, 512, 1); |
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | static int mmc_test_multi_read(struct mmc_test_card *test) | 1092 | static int mmc_test_multi_read(struct mmc_test_card *test) |
@@ -1107,7 +1107,7 @@ static int mmc_test_multi_read(struct mmc_test_card *test) | |||
1107 | 1107 | ||
1108 | sg_init_one(&sg, test->buffer, size); | 1108 | sg_init_one(&sg, test->buffer, size); |
1109 | 1109 | ||
1110 | return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0); | 1110 | return mmc_test_transfer(test, &sg, 1, 0, size / 512, 512, 0); |
1111 | } | 1111 | } |
1112 | 1112 | ||
1113 | static int mmc_test_pow2_write(struct mmc_test_card *test) | 1113 | static int mmc_test_pow2_write(struct mmc_test_card *test) |
@@ -1118,7 +1118,7 @@ static int mmc_test_pow2_write(struct mmc_test_card *test) | |||
1118 | if (!test->card->csd.write_partial) | 1118 | if (!test->card->csd.write_partial) |
1119 | return RESULT_UNSUP_CARD; | 1119 | return RESULT_UNSUP_CARD; |
1120 | 1120 | ||
1121 | for (i = 1; i < 512;i <<= 1) { | 1121 | for (i = 1; i < 512; i <<= 1) { |
1122 | sg_init_one(&sg, test->buffer, i); | 1122 | sg_init_one(&sg, test->buffer, i); |
1123 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 1); | 1123 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 1); |
1124 | if (ret) | 1124 | if (ret) |
@@ -1136,7 +1136,7 @@ static int mmc_test_pow2_read(struct mmc_test_card *test) | |||
1136 | if (!test->card->csd.read_partial) | 1136 | if (!test->card->csd.read_partial) |
1137 | return RESULT_UNSUP_CARD; | 1137 | return RESULT_UNSUP_CARD; |
1138 | 1138 | ||
1139 | for (i = 1; i < 512;i <<= 1) { | 1139 | for (i = 1; i < 512; i <<= 1) { |
1140 | sg_init_one(&sg, test->buffer, i); | 1140 | sg_init_one(&sg, test->buffer, i); |
1141 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 0); | 1141 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 0); |
1142 | if (ret) | 1142 | if (ret) |
@@ -1154,7 +1154,7 @@ static int mmc_test_weird_write(struct mmc_test_card *test) | |||
1154 | if (!test->card->csd.write_partial) | 1154 | if (!test->card->csd.write_partial) |
1155 | return RESULT_UNSUP_CARD; | 1155 | return RESULT_UNSUP_CARD; |
1156 | 1156 | ||
1157 | for (i = 3; i < 512;i += 7) { | 1157 | for (i = 3; i < 512; i += 7) { |
1158 | sg_init_one(&sg, test->buffer, i); | 1158 | sg_init_one(&sg, test->buffer, i); |
1159 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 1); | 1159 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 1); |
1160 | if (ret) | 1160 | if (ret) |
@@ -1172,7 +1172,7 @@ static int mmc_test_weird_read(struct mmc_test_card *test) | |||
1172 | if (!test->card->csd.read_partial) | 1172 | if (!test->card->csd.read_partial) |
1173 | return RESULT_UNSUP_CARD; | 1173 | return RESULT_UNSUP_CARD; |
1174 | 1174 | ||
1175 | for (i = 3; i < 512;i += 7) { | 1175 | for (i = 3; i < 512; i += 7) { |
1176 | sg_init_one(&sg, test->buffer, i); | 1176 | sg_init_one(&sg, test->buffer, i); |
1177 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 0); | 1177 | ret = mmc_test_transfer(test, &sg, 1, 0, 1, i, 0); |
1178 | if (ret) | 1178 | if (ret) |
@@ -1231,7 +1231,7 @@ static int mmc_test_align_multi_write(struct mmc_test_card *test) | |||
1231 | 1231 | ||
1232 | for (i = 1; i < TEST_ALIGN_END; i++) { | 1232 | for (i = 1; i < TEST_ALIGN_END; i++) { |
1233 | sg_init_one(&sg, test->buffer + i, size); | 1233 | sg_init_one(&sg, test->buffer + i, size); |
1234 | ret = mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1); | 1234 | ret = mmc_test_transfer(test, &sg, 1, 0, size / 512, 512, 1); |
1235 | if (ret) | 1235 | if (ret) |
1236 | return ret; | 1236 | return ret; |
1237 | } | 1237 | } |
@@ -1258,7 +1258,7 @@ static int mmc_test_align_multi_read(struct mmc_test_card *test) | |||
1258 | 1258 | ||
1259 | for (i = 1; i < TEST_ALIGN_END; i++) { | 1259 | for (i = 1; i < TEST_ALIGN_END; i++) { |
1260 | sg_init_one(&sg, test->buffer + i, size); | 1260 | sg_init_one(&sg, test->buffer + i, size); |
1261 | ret = mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0); | 1261 | ret = mmc_test_transfer(test, &sg, 1, 0, size / 512, 512, 0); |
1262 | if (ret) | 1262 | if (ret) |
1263 | return ret; | 1263 | return ret; |
1264 | } | 1264 | } |
@@ -1357,7 +1357,7 @@ static int mmc_test_multi_write_high(struct mmc_test_card *test) | |||
1357 | sg_init_table(&sg, 1); | 1357 | sg_init_table(&sg, 1); |
1358 | sg_set_page(&sg, test->highmem, size, 0); | 1358 | sg_set_page(&sg, test->highmem, size, 0); |
1359 | 1359 | ||
1360 | return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1); | 1360 | return mmc_test_transfer(test, &sg, 1, 0, size / 512, 512, 1); |
1361 | } | 1361 | } |
1362 | 1362 | ||
1363 | static int mmc_test_multi_read_high(struct mmc_test_card *test) | 1363 | static int mmc_test_multi_read_high(struct mmc_test_card *test) |
@@ -1379,7 +1379,7 @@ static int mmc_test_multi_read_high(struct mmc_test_card *test) | |||
1379 | sg_init_table(&sg, 1); | 1379 | sg_init_table(&sg, 1); |
1380 | sg_set_page(&sg, test->highmem, size, 0); | 1380 | sg_set_page(&sg, test->highmem, size, 0); |
1381 | 1381 | ||
1382 | return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0); | 1382 | return mmc_test_transfer(test, &sg, 1, 0, size / 512, 512, 0); |
1383 | } | 1383 | } |
1384 | 1384 | ||
1385 | #else | 1385 | #else |
@@ -2147,7 +2147,7 @@ static int mmc_test_rw_multiple_sg_len(struct mmc_test_card *test, | |||
2147 | int i; | 2147 | int i; |
2148 | 2148 | ||
2149 | for (i = 0 ; i < rw->len && ret == 0; i++) { | 2149 | for (i = 0 ; i < rw->len && ret == 0; i++) { |
2150 | ret = mmc_test_rw_multiple(test, rw, 512*1024, rw->size, | 2150 | ret = mmc_test_rw_multiple(test, rw, 512 * 1024, rw->size, |
2151 | rw->sg_len[i]); | 2151 | rw->sg_len[i]); |
2152 | if (ret) | 2152 | if (ret) |
2153 | break; | 2153 | break; |
@@ -2954,7 +2954,7 @@ static void mmc_test_run(struct mmc_test_card *test, int testcase) | |||
2954 | 2954 | ||
2955 | mmc_claim_host(test->card->host); | 2955 | mmc_claim_host(test->card->host); |
2956 | 2956 | ||
2957 | for (i = 0;i < ARRAY_SIZE(mmc_test_cases);i++) { | 2957 | for (i = 0; i < ARRAY_SIZE(mmc_test_cases); i++) { |
2958 | struct mmc_test_general_result *gr; | 2958 | struct mmc_test_general_result *gr; |
2959 | 2959 | ||
2960 | if (testcase && ((i + 1) != testcase)) | 2960 | if (testcase && ((i + 1) != testcase)) |
@@ -3165,7 +3165,7 @@ static int mtf_testlist_show(struct seq_file *sf, void *data) | |||
3165 | 3165 | ||
3166 | seq_puts(sf, "0:\tRun all tests\n"); | 3166 | seq_puts(sf, "0:\tRun all tests\n"); |
3167 | for (i = 0; i < ARRAY_SIZE(mmc_test_cases); i++) | 3167 | for (i = 0; i < ARRAY_SIZE(mmc_test_cases); i++) |
3168 | seq_printf(sf, "%d:\t%s\n", i+1, mmc_test_cases[i].name); | 3168 | seq_printf(sf, "%d:\t%s\n", i + 1, mmc_test_cases[i].name); |
3169 | 3169 | ||
3170 | mutex_unlock(&mmc_test_lock); | 3170 | mutex_unlock(&mmc_test_lock); |
3171 | 3171 | ||