mmc: initialize struct mmc_command at declaration time

Converts from:
	struct mmc_command cmd;
	memset(&cmd, 0, sizeof(struct mmc_command));

to:
	struct mmc_command cmd = {0};

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

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

1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 9e30cf6db53c..93a7efcbfde9 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -260,14 +260,12 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
         __be32 *blocks;
 
         struct mmc_request mrq;
-        struct mmc_command cmd;
+        struct mmc_command cmd = {0};
         struct mmc_data data;
         unsigned int timeout_us;
 
         struct scatterlist sg;
 
-        memset(&cmd, 0, sizeof(struct mmc_command));
-
         cmd.opcode = MMC_APP_CMD;
         cmd.arg = card->rca << 16;
         cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
@@ -328,10 +326,9 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
 
 static u32 get_card_status(struct mmc_card *card, struct request *req)
 {
-        struct mmc_command cmd;
+        struct mmc_command cmd = {0};
         int err;
 
-        memset(&cmd, 0, sizeof(struct mmc_command));
         cmd.opcode = MMC_SEND_STATUS;
         if (!mmc_host_is_spi(card->host))
                 cmd.arg = card->rca << 16;
@@ -460,7 +457,7 @@ static inline int mmc_apply_rel_rw(struct mmc_blk_request *brq,
                                    struct request *req)
 {
         int err;
-        struct mmc_command set_count;
+        struct mmc_command set_count = {0};
 
         if (!(card->ext_csd.rel_param & EXT_CSD_WR_REL_PARAM_EN)) {
                 /* Legacy mode imposes restrictions on transfers. */
@@ -473,7 +470,6 @@ static inline int mmc_apply_rel_rw(struct mmc_blk_request *brq,
                         brq->data.blocks = 1;
         }
 
-        memset(&set_count, 0, sizeof(struct mmc_command));
         set_count.opcode = MMC_SET_BLOCK_COUNT;
         set_count.arg = brq->data.blocks | (1 << 31);
         set_count.flags = MMC_RSP_R1 | MMC_CMD_AC;
@@ -501,10 +497,9 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *req)
                 REL_WRITES_SUPPORTED(card);
 
         do {
-                struct mmc_command cmd;
+                struct mmc_command cmd = {0};
                 u32 readcmd, writecmd, status = 0;
 
-                memset(&cmd, 0, sizeof(struct mmc_command));
                 memset(&brq, 0, sizeof(struct mmc_blk_request));
                 brq.mrq.cmd = &brq.cmd;
                 brq.mrq.data = &brq.data;