Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / card / mmc_test.c

diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 53b741398b9330e33136cc4b6e0b8eddae69cf96..b78cf5d403a33b74244a39245b9df6f9024c4d24 100644 (file)
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -268,8 +268,6 @@ static int mmc_test_wait_busy(struct mmc_test_card *test)
 static int mmc_test_buffer_transfer(struct mmc_test_card *test,
        u8 *buffer, unsigned addr, unsigned blksz, int write)
 {
-       int ret;
-
        struct mmc_request mrq = {0};
        struct mmc_command cmd = {0};
        struct mmc_command stop = {0};
@@ -292,11 +290,7 @@ static int mmc_test_buffer_transfer(struct mmc_test_card *test,
        if (data.error)
                return data.error;
 
-       ret = mmc_test_wait_busy(test);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_wait_busy(test);
 }
 
 static void mmc_test_free_mem(struct mmc_test_mem *mem)
@@ -826,9 +820,7 @@ static int mmc_test_nonblock_transfer(struct mmc_test_card *test,
                                mmc_test_nonblock_reset(&mrq1, &cmd1,
                                                        &stop1, &data1);
                }
-               done_areq = cur_areq;
-               cur_areq = other_areq;
-               other_areq = done_areq;
+               swap(cur_areq, other_areq);
                dev_addr += blocks;
        }
 
@@ -994,11 +986,7 @@ static int mmc_test_basic_write(struct mmc_test_card *test)
 
        sg_init_one(&sg, test->buffer, 512);
 
-       ret = mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 1);
 }
 
 static int mmc_test_basic_read(struct mmc_test_card *test)
@@ -1012,44 +1000,29 @@ static int mmc_test_basic_read(struct mmc_test_card *test)
 
        sg_init_one(&sg, test->buffer, 512);
 
-       ret = mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 0);
 }
 
 static int mmc_test_verify_write(struct mmc_test_card *test)
 {
-       int ret;
        struct scatterlist sg;
 
        sg_init_one(&sg, test->buffer, 512);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, 1, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, 1, 512, 1);
 }
 
 static int mmc_test_verify_read(struct mmc_test_card *test)
 {
-       int ret;
        struct scatterlist sg;
 
        sg_init_one(&sg, test->buffer, 512);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, 1, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, 1, 512, 0);
 }
 
 static int mmc_test_multi_write(struct mmc_test_card *test)
 {
-       int ret;
        unsigned int size;
        struct scatterlist sg;
 
@@ -1066,16 +1039,11 @@ static int mmc_test_multi_write(struct mmc_test_card *test)
 
        sg_init_one(&sg, test->buffer, size);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1);
 }
 
 static int mmc_test_multi_read(struct mmc_test_card *test)
 {
-       int ret;
        unsigned int size;
        struct scatterlist sg;
 
@@ -1092,11 +1060,7 @@ static int mmc_test_multi_read(struct mmc_test_card *test)
 
        sg_init_one(&sg, test->buffer, size);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0);
 }
 
 static int mmc_test_pow2_write(struct mmc_test_card *test)
@@ -1263,11 +1227,7 @@ static int mmc_test_xfersize_write(struct mmc_test_card *test)
        if (ret)
                return ret;
 
-       ret = mmc_test_broken_transfer(test, 1, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_broken_transfer(test, 1, 512, 1);
 }
 
 static int mmc_test_xfersize_read(struct mmc_test_card *test)
@@ -1278,11 +1238,7 @@ static int mmc_test_xfersize_read(struct mmc_test_card *test)
        if (ret)
                return ret;
 
-       ret = mmc_test_broken_transfer(test, 1, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_broken_transfer(test, 1, 512, 0);
 }
 
 static int mmc_test_multi_xfersize_write(struct mmc_test_card *test)
@@ -1296,11 +1252,7 @@ static int mmc_test_multi_xfersize_write(struct mmc_test_card *test)
        if (ret)
                return ret;
 
-       ret = mmc_test_broken_transfer(test, 2, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_broken_transfer(test, 2, 512, 1);
 }
 
 static int mmc_test_multi_xfersize_read(struct mmc_test_card *test)
@@ -1314,48 +1266,33 @@ static int mmc_test_multi_xfersize_read(struct mmc_test_card *test)
        if (ret)
                return ret;
 
-       ret = mmc_test_broken_transfer(test, 2, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_broken_transfer(test, 2, 512, 0);
 }
 
 #ifdef CONFIG_HIGHMEM
 
 static int mmc_test_write_high(struct mmc_test_card *test)
 {
-       int ret;
        struct scatterlist sg;
 
        sg_init_table(&sg, 1);
        sg_set_page(&sg, test->highmem, 512, 0);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, 1, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, 1, 512, 1);
 }
 
 static int mmc_test_read_high(struct mmc_test_card *test)
 {
-       int ret;
        struct scatterlist sg;
 
        sg_init_table(&sg, 1);
        sg_set_page(&sg, test->highmem, 512, 0);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, 1, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, 1, 512, 0);
 }
 
 static int mmc_test_multi_write_high(struct mmc_test_card *test)
 {
-       int ret;
        unsigned int size;
        struct scatterlist sg;
 
@@ -1373,16 +1310,11 @@ static int mmc_test_multi_write_high(struct mmc_test_card *test)
        sg_init_table(&sg, 1);
        sg_set_page(&sg, test->highmem, size, 0);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 1);
 }
 
 static int mmc_test_multi_read_high(struct mmc_test_card *test)
 {
-       int ret;
        unsigned int size;
        struct scatterlist sg;
 
@@ -1400,11 +1332,7 @@ static int mmc_test_multi_read_high(struct mmc_test_card *test)
        sg_init_table(&sg, 1);
        sg_set_page(&sg, test->highmem, size, 0);
 
-       ret = mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0);
-       if (ret)
-               return ret;
-
-       return 0;
+       return mmc_test_transfer(test, &sg, 1, 0, size/512, 512, 0);
 }
 
 #else