mmc: initialize struct mmc_data at declaration time

Converts from:
	struct mmc_data data;
	memset(&data, 0, sizeof(struct mmc_data));

to:
	struct mmc_data data = {0};

because it's shorter, as performant, and easier to work out whether
initialization has happened.

Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 93a7efcbfde96aec97f23e748ced27164807b608..fb387c8032054fcaac7a7930e96fc2f456d75685 100644 (file)
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -261,7 +261,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
 
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        unsigned int timeout_us;
 
        struct scatterlist sg;
@@ -282,8 +282,6 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
        cmd.arg = 0;
        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
 
-       memset(&data, 0, sizeof(struct mmc_data));
-
        data.timeout_ns = card->csd.tacc_ns * 100;
        data.timeout_clks = card->csd.tacc_clks * 100;
 

diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 95c298faeb48f05ff91bef221f537562adf52e05..f44762b6e592919b76fdc957d833a07aca172cd4 100644 (file)
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -249,12 +249,11 @@ static int mmc_test_buffer_transfer(struct mmc_test_card *test,
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
        struct mmc_command stop = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
 
        struct scatterlist sg;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;
@@ -732,10 +731,9 @@ static int mmc_test_simple_transfer(struct mmc_test_card *test,
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
        struct mmc_command stop = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;
@@ -760,12 +758,11 @@ static int mmc_test_broken_transfer(struct mmc_test_card *test,
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
        struct mmc_command stop = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
 
        struct scatterlist sg;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index de4e1855b8ed4ef424a854dcb754c5718fb948a2..1ed3866e990f4807029c66bf93d60243722f496e 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -235,7 +235,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
 {
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        struct scatterlist sg;
        void *data_buf;
 
@@ -247,7 +247,6 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
                return -ENOMEM;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;
@@ -459,7 +458,7 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
 {
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        struct scatterlist sg;
        u8 *data_buf;
        u8 *test_buf;
@@ -489,7 +488,6 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
                memcpy(data_buf, test_buf, len);
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;

diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index dfe9a9c3f958a2fa616608f6331ab350265b9ecb..8023f580b9013b664d9f888002c5566f086baf1d 100644 (file)
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -245,7 +245,7 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
        int err;
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        struct scatterlist sg;
        void *data_buf;
 
@@ -267,7 +267,6 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
                return -ENOMEM;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;
@@ -307,7 +306,7 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group,
 {
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        struct scatterlist sg;
 
        BUG_ON(!card);
@@ -319,7 +318,6 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group,
        value &= 0xF;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;
@@ -355,7 +353,7 @@ int mmc_app_sd_status(struct mmc_card *card, void *ssr)
        int err;
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        struct scatterlist sg;
 
        BUG_ON(!card);
@@ -369,7 +367,6 @@ int mmc_app_sd_status(struct mmc_card *card, void *ssr)
                return err;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;

diff --git a/drivers/mmc/core/sdio_ops.c b/drivers/mmc/core/sdio_ops.c
index f77b1bc318ed74dce86bd423e6cba7c120049dca..147dfc1879b318782bb46b739f6b736bfffe2a58 100644 (file)
--- a/drivers/mmc/core/sdio_ops.c
+++ b/drivers/mmc/core/sdio_ops.c
@@ -123,7 +123,7 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,
 {
        struct mmc_request mrq;
        struct mmc_command cmd = {0};
-       struct mmc_data data;
+       struct mmc_data data = {0};
        struct scatterlist sg;
 
        BUG_ON(!card);
@@ -137,7 +137,6 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,
                return -EINVAL;
 
        memset(&mrq, 0, sizeof(struct mmc_request));
-       memset(&data, 0, sizeof(struct mmc_data));
 
        mrq.cmd = &cmd;
        mrq.data = &data;