1 files changed, 57 insertions, 59 deletions

diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index abc1a63bcc5e..233cdfae92f4 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -212,7 +212,7 @@ static int mmc_test_busy(struct mmc_command *cmd)
 static int mmc_test_wait_busy(struct mmc_test_card *test)
 {
         int ret, busy;
-        struct mmc_command cmd;
+        struct mmc_command cmd = {0};
 
         busy = 0;
         do {
@@ -246,18 +246,13 @@ static int mmc_test_buffer_transfer(struct mmc_test_card *test,
 {
         int ret;
 
-        struct mmc_request mrq;
-        struct mmc_command cmd;
-        struct mmc_command stop;
-        struct mmc_data data;
+        struct mmc_request mrq = {0};
+        struct mmc_command cmd = {0};
+        struct mmc_command stop = {0};
+        struct mmc_data data = {0};
 
         struct scatterlist sg;
 
-        memset(&mrq, 0, sizeof(struct mmc_request));
-        memset(&cmd, 0, sizeof(struct mmc_command));
-        memset(&data, 0, sizeof(struct mmc_data));
-        memset(&stop, 0, sizeof(struct mmc_command));
-
         mrq.cmd = &cmd;
         mrq.data = &data;
         mrq.stop = &stop;
@@ -731,15 +726,10 @@ static int mmc_test_simple_transfer(struct mmc_test_card *test,
         struct scatterlist *sg, unsigned sg_len, unsigned dev_addr,
         unsigned blocks, unsigned blksz, int write)
 {
-        struct mmc_request mrq;
-        struct mmc_command cmd;
-        struct mmc_command stop;
-        struct mmc_data data;
-
-        memset(&mrq, 0, sizeof(struct mmc_request));
-        memset(&cmd, 0, sizeof(struct mmc_command));
-        memset(&data, 0, sizeof(struct mmc_data));
-        memset(&stop, 0, sizeof(struct mmc_command));
+        struct mmc_request mrq = {0};
+        struct mmc_command cmd = {0};
+        struct mmc_command stop = {0};
+        struct mmc_data data = {0};
 
         mrq.cmd = &cmd;
         mrq.data = &data;
@@ -761,18 +751,13 @@ static int mmc_test_simple_transfer(struct mmc_test_card *test,
 static int mmc_test_broken_transfer(struct mmc_test_card *test,
         unsigned blocks, unsigned blksz, int write)
 {
-        struct mmc_request mrq;
-        struct mmc_command cmd;
-        struct mmc_command stop;
-        struct mmc_data data;
+        struct mmc_request mrq = {0};
+        struct mmc_command cmd = {0};
+        struct mmc_command stop = {0};
+        struct mmc_data data = {0};
 
         struct scatterlist sg;
 
-        memset(&mrq, 0, sizeof(struct mmc_request));
-        memset(&cmd, 0, sizeof(struct mmc_command));
-        memset(&data, 0, sizeof(struct mmc_data));
-        memset(&stop, 0, sizeof(struct mmc_command));
-
         mrq.cmd = &cmd;
         mrq.data = &data;
         mrq.stop = &stop;
@@ -1401,8 +1386,9 @@ static int mmc_test_area_io(struct mmc_test_card *test, unsigned long sz,
  */
 static int mmc_test_area_fill(struct mmc_test_card *test)
 {
-        return mmc_test_area_io(test, test->area.max_tfr, test->area.dev_addr,
-                                1, 0, 0);
+        struct mmc_test_area *t = &test->area;
+
+        return mmc_test_area_io(test, t->max_tfr, t->dev_addr, 1, 0, 0);
 }
 
 /*
@@ -1415,7 +1401,7 @@ static int mmc_test_area_erase(struct mmc_test_card *test)
         if (!mmc_can_erase(test->card))
                 return 0;
 
-        return mmc_erase(test->card, t->dev_addr, test->area.max_sz >> 9,
+        return mmc_erase(test->card, t->dev_addr, t->max_sz >> 9,
                          MMC_ERASE_ARG);
 }
 
@@ -1542,8 +1528,10 @@ static int mmc_test_area_prepare_fill(struct mmc_test_card *test)
 static int mmc_test_best_performance(struct mmc_test_card *test, int write,
                                      int max_scatter)
 {
-        return mmc_test_area_io(test, test->area.max_tfr, test->area.dev_addr,
-                                write, max_scatter, 1);
+        struct mmc_test_area *t = &test->area;
+
+        return mmc_test_area_io(test, t->max_tfr, t->dev_addr, write,
+                                max_scatter, 1);
 }
 
 /*
@@ -1583,18 +1571,19 @@ static int mmc_test_best_write_perf_max_scatter(struct mmc_test_card *test)
  */
 static int mmc_test_profile_read_perf(struct mmc_test_card *test)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned long sz;
         unsigned int dev_addr;
         int ret;
 
-        for (sz = 512; sz < test->area.max_tfr; sz <<= 1) {
-                dev_addr = test->area.dev_addr + (sz >> 9);
+        for (sz = 512; sz < t->max_tfr; sz <<= 1) {
+                dev_addr = t->dev_addr + (sz >> 9);
                 ret = mmc_test_area_io(test, sz, dev_addr, 0, 0, 1);
                 if (ret)
                         return ret;
         }
-        sz = test->area.max_tfr;
-        dev_addr = test->area.dev_addr;
+        sz = t->max_tfr;
+        dev_addr = t->dev_addr;
         return mmc_test_area_io(test, sz, dev_addr, 0, 0, 1);
 }
 
@@ -1603,6 +1592,7 @@ static int mmc_test_profile_read_perf(struct mmc_test_card *test)
  */
 static int mmc_test_profile_write_perf(struct mmc_test_card *test)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned long sz;
         unsigned int dev_addr;
         int ret;
@@ -1610,8 +1600,8 @@ static int mmc_test_profile_write_perf(struct mmc_test_card *test)
         ret = mmc_test_area_erase(test);
         if (ret)
                 return ret;
-        for (sz = 512; sz < test->area.max_tfr; sz <<= 1) {
-                dev_addr = test->area.dev_addr + (sz >> 9);
+        for (sz = 512; sz < t->max_tfr; sz <<= 1) {
+                dev_addr = t->dev_addr + (sz >> 9);
                 ret = mmc_test_area_io(test, sz, dev_addr, 1, 0, 1);
                 if (ret)
                         return ret;
@@ -1619,8 +1609,8 @@ static int mmc_test_profile_write_perf(struct mmc_test_card *test)
         ret = mmc_test_area_erase(test);
         if (ret)
                 return ret;
-        sz = test->area.max_tfr;
-        dev_addr = test->area.dev_addr;
+        sz = t->max_tfr;
+        dev_addr = t->dev_addr;
         return mmc_test_area_io(test, sz, dev_addr, 1, 0, 1);
 }
 
@@ -1629,6 +1619,7 @@ static int mmc_test_profile_write_perf(struct mmc_test_card *test)
  */
 static int mmc_test_profile_trim_perf(struct mmc_test_card *test)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned long sz;
         unsigned int dev_addr;
         struct timespec ts1, ts2;
@@ -1640,8 +1631,8 @@ static int mmc_test_profile_trim_perf(struct mmc_test_card *test)
         if (!mmc_can_erase(test->card))
                 return RESULT_UNSUP_HOST;
 
-        for (sz = 512; sz < test->area.max_sz; sz <<= 1) {
-                dev_addr = test->area.dev_addr + (sz >> 9);
+        for (sz = 512; sz < t->max_sz; sz <<= 1) {
+                dev_addr = t->dev_addr + (sz >> 9);
                 getnstimeofday(&ts1);
                 ret = mmc_erase(test->card, dev_addr, sz >> 9, MMC_TRIM_ARG);
                 if (ret)
@@ -1649,7 +1640,7 @@ static int mmc_test_profile_trim_perf(struct mmc_test_card *test)
                 getnstimeofday(&ts2);
                 mmc_test_print_rate(test, sz, &ts1, &ts2);
         }
-        dev_addr = test->area.dev_addr;
+        dev_addr = t->dev_addr;
         getnstimeofday(&ts1);
         ret = mmc_erase(test->card, dev_addr, sz >> 9, MMC_TRIM_ARG);
         if (ret)
@@ -1661,12 +1652,13 @@ static int mmc_test_profile_trim_perf(struct mmc_test_card *test)
 
 static int mmc_test_seq_read_perf(struct mmc_test_card *test, unsigned long sz)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned int dev_addr, i, cnt;
         struct timespec ts1, ts2;
         int ret;
 
-        cnt = test->area.max_sz / sz;
-        dev_addr = test->area.dev_addr;
+        cnt = t->max_sz / sz;
+        dev_addr = t->dev_addr;
         getnstimeofday(&ts1);
         for (i = 0; i < cnt; i++) {
                 ret = mmc_test_area_io(test, sz, dev_addr, 0, 0, 0);
@@ -1684,20 +1676,22 @@ static int mmc_test_seq_read_perf(struct mmc_test_card *test, unsigned long sz)
  */
 static int mmc_test_profile_seq_read_perf(struct mmc_test_card *test)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned long sz;
         int ret;
 
-        for (sz = 512; sz < test->area.max_tfr; sz <<= 1) {
+        for (sz = 512; sz < t->max_tfr; sz <<= 1) {
                 ret = mmc_test_seq_read_perf(test, sz);
                 if (ret)
                         return ret;
         }
-        sz = test->area.max_tfr;
+        sz = t->max_tfr;
         return mmc_test_seq_read_perf(test, sz);
 }
 
 static int mmc_test_seq_write_perf(struct mmc_test_card *test, unsigned long sz)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned int dev_addr, i, cnt;
         struct timespec ts1, ts2;
         int ret;
@@ -1705,8 +1699,8 @@ static int mmc_test_seq_write_perf(struct mmc_test_card *test, unsigned long sz)
         ret = mmc_test_area_erase(test);
         if (ret)
                 return ret;
-        cnt = test->area.max_sz / sz;
-        dev_addr = test->area.dev_addr;
+        cnt = t->max_sz / sz;
+        dev_addr = t->dev_addr;
         getnstimeofday(&ts1);
         for (i = 0; i < cnt; i++) {
                 ret = mmc_test_area_io(test, sz, dev_addr, 1, 0, 0);
@@ -1724,15 +1718,16 @@ static int mmc_test_seq_write_perf(struct mmc_test_card *test, unsigned long sz)
  */
 static int mmc_test_profile_seq_write_perf(struct mmc_test_card *test)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned long sz;
         int ret;
 
-        for (sz = 512; sz < test->area.max_tfr; sz <<= 1) {
+        for (sz = 512; sz < t->max_tfr; sz <<= 1) {
                 ret = mmc_test_seq_write_perf(test, sz);
                 if (ret)
                         return ret;
         }
-        sz = test->area.max_tfr;
+        sz = t->max_tfr;
         return mmc_test_seq_write_perf(test, sz);
 }
 
@@ -1741,6 +1736,7 @@ static int mmc_test_profile_seq_write_perf(struct mmc_test_card *test)
  */
 static int mmc_test_profile_seq_trim_perf(struct mmc_test_card *test)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned long sz;
         unsigned int dev_addr, i, cnt;
         struct timespec ts1, ts2;
@@ -1752,15 +1748,15 @@ static int mmc_test_profile_seq_trim_perf(struct mmc_test_card *test)
         if (!mmc_can_erase(test->card))
                 return RESULT_UNSUP_HOST;
 
-        for (sz = 512; sz <= test->area.max_sz; sz <<= 1) {
+        for (sz = 512; sz <= t->max_sz; sz <<= 1) {
                 ret = mmc_test_area_erase(test);
                 if (ret)
                         return ret;
                 ret = mmc_test_area_fill(test);
                 if (ret)
                         return ret;
-                cnt = test->area.max_sz / sz;
-                dev_addr = test->area.dev_addr;
+                cnt = t->max_sz / sz;
+                dev_addr = t->dev_addr;
                 getnstimeofday(&ts1);
                 for (i = 0; i < cnt; i++) {
                         ret = mmc_erase(test->card, dev_addr, sz >> 9,
@@ -1823,11 +1819,12 @@ static int mmc_test_rnd_perf(struct mmc_test_card *test, int write, int print,
 
 static int mmc_test_random_perf(struct mmc_test_card *test, int write)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned int next;
         unsigned long sz;
         int ret;
 
-        for (sz = 512; sz < test->area.max_tfr; sz <<= 1) {
+        for (sz = 512; sz < t->max_tfr; sz <<= 1) {
                 /*
                  * When writing, try to get more consistent results by running
                  * the test twice with exactly the same I/O but outputting the
@@ -1844,7 +1841,7 @@ static int mmc_test_random_perf(struct mmc_test_card *test, int write)
                 if (ret)
                         return ret;
         }
-        sz = test->area.max_tfr;
+        sz = t->max_tfr;
         if (write) {
                 next = rnd_next;
                 ret = mmc_test_rnd_perf(test, write, 0, sz);
@@ -1874,17 +1871,18 @@ static int mmc_test_random_write_perf(struct mmc_test_card *test)
 static int mmc_test_seq_perf(struct mmc_test_card *test, int write,
                              unsigned int tot_sz, int max_scatter)
 {
+        struct mmc_test_area *t = &test->area;
         unsigned int dev_addr, i, cnt, sz, ssz;
         struct timespec ts1, ts2;
         int ret;
 
-        sz = test->area.max_tfr;
+        sz = t->max_tfr;
+
         /*
          * In the case of a maximally scattered transfer, the maximum transfer
          * size is further limited by using PAGE_SIZE segments.
          */
         if (max_scatter) {
-                struct mmc_test_area *t = &test->area;
                 unsigned long max_tfr;
 
                 if (t->max_seg_sz >= PAGE_SIZE)