diff options
author | Chris Ball <cjb@laptop.org> | 2011-04-13 23:40:30 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-05-24 21:01:52 -0400 |
commit | 1278dba167f01bb3c6626d16450d31129d041087 (patch) | |
tree | 6fb3af716e5437cb558ae37fd8a58db23b9b173e /drivers/mmc/core/sdio_ops.c | |
parent | 62929e4be3fe4cc632b3b03645e083c6548de531 (diff) |
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>
Diffstat (limited to 'drivers/mmc/core/sdio_ops.c')
-rw-r--r-- | drivers/mmc/core/sdio_ops.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mmc/core/sdio_ops.c b/drivers/mmc/core/sdio_ops.c index dea36d9c22e..f77b1bc318e 100644 --- a/drivers/mmc/core/sdio_ops.c +++ b/drivers/mmc/core/sdio_ops.c | |||
@@ -21,13 +21,11 @@ | |||
21 | 21 | ||
22 | int mmc_send_io_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr) | 22 | int mmc_send_io_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr) |
23 | { | 23 | { |
24 | struct mmc_command cmd; | 24 | struct mmc_command cmd = {0}; |
25 | int i, err = 0; | 25 | int i, err = 0; |
26 | 26 | ||
27 | BUG_ON(!host); | 27 | BUG_ON(!host); |
28 | 28 | ||
29 | memset(&cmd, 0, sizeof(struct mmc_command)); | ||
30 | |||
31 | cmd.opcode = SD_IO_SEND_OP_COND; | 29 | cmd.opcode = SD_IO_SEND_OP_COND; |
32 | cmd.arg = ocr; | 30 | cmd.arg = ocr; |
33 | cmd.flags = MMC_RSP_SPI_R4 | MMC_RSP_R4 | MMC_CMD_BCR; | 31 | cmd.flags = MMC_RSP_SPI_R4 | MMC_RSP_R4 | MMC_CMD_BCR; |
@@ -70,7 +68,7 @@ int mmc_send_io_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr) | |||
70 | static int mmc_io_rw_direct_host(struct mmc_host *host, int write, unsigned fn, | 68 | static int mmc_io_rw_direct_host(struct mmc_host *host, int write, unsigned fn, |
71 | unsigned addr, u8 in, u8 *out) | 69 | unsigned addr, u8 in, u8 *out) |
72 | { | 70 | { |
73 | struct mmc_command cmd; | 71 | struct mmc_command cmd = {0}; |
74 | int err; | 72 | int err; |
75 | 73 | ||
76 | BUG_ON(!host); | 74 | BUG_ON(!host); |
@@ -80,8 +78,6 @@ static int mmc_io_rw_direct_host(struct mmc_host *host, int write, unsigned fn, | |||
80 | if (addr & ~0x1FFFF) | 78 | if (addr & ~0x1FFFF) |
81 | return -EINVAL; | 79 | return -EINVAL; |
82 | 80 | ||
83 | memset(&cmd, 0, sizeof(struct mmc_command)); | ||
84 | |||
85 | cmd.opcode = SD_IO_RW_DIRECT; | 81 | cmd.opcode = SD_IO_RW_DIRECT; |
86 | cmd.arg = write ? 0x80000000 : 0x00000000; | 82 | cmd.arg = write ? 0x80000000 : 0x00000000; |
87 | cmd.arg |= fn << 28; | 83 | cmd.arg |= fn << 28; |
@@ -126,7 +122,7 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn, | |||
126 | unsigned addr, int incr_addr, u8 *buf, unsigned blocks, unsigned blksz) | 122 | unsigned addr, int incr_addr, u8 *buf, unsigned blocks, unsigned blksz) |
127 | { | 123 | { |
128 | struct mmc_request mrq; | 124 | struct mmc_request mrq; |
129 | struct mmc_command cmd; | 125 | struct mmc_command cmd = {0}; |
130 | struct mmc_data data; | 126 | struct mmc_data data; |
131 | struct scatterlist sg; | 127 | struct scatterlist sg; |
132 | 128 | ||
@@ -141,7 +137,6 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn, | |||
141 | return -EINVAL; | 137 | return -EINVAL; |
142 | 138 | ||
143 | memset(&mrq, 0, sizeof(struct mmc_request)); | 139 | memset(&mrq, 0, sizeof(struct mmc_request)); |
144 | memset(&cmd, 0, sizeof(struct mmc_command)); | ||
145 | memset(&data, 0, sizeof(struct mmc_data)); | 140 | memset(&data, 0, sizeof(struct mmc_data)); |
146 | 141 | ||
147 | mrq.cmd = &cmd; | 142 | mrq.cmd = &cmd; |