diff options
| author | Chris Ball <cjb@laptop.org> | 2011-04-14 07:46:05 +0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-05-25 05:01:56 +0400 |
| commit | a61ad2b49bfce94dfddce828cd9222e4b9e7825b (patch) | |
| tree | 36f93e61adc7c7d7523c78c78c3df1e75fae5e33 /drivers/mmc/core | |
| parent | 1278dba167f01bb3c6626d16450d31129d041087 (diff) | |
| download | linux-a61ad2b49bfce94dfddce828cd9222e4b9e7825b.tar.xz | |
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>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/mmc_ops.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/core/sd_ops.c | 9 | ||||
| -rw-r--r-- | drivers/mmc/core/sdio_ops.c | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index de4e1855b8ed..1ed3866e990f 100644 --- 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 dfe9a9c3f958..8023f580b901 100644 --- 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 f77b1bc318ed..147dfc1879b3 100644 --- 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; |