diff options
author | Chris Ball <cjb@laptop.org> | 2011-04-13 23:49:45 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-05-24 21:02:01 -0400 |
commit | 24f5b53ba076e983bc64fa48534ca795d7813d51 (patch) | |
tree | 6ae546b6443ec6f28694a9688fdd79da633c57b7 /drivers/mmc/core/sd_ops.c | |
parent | a61ad2b49bfce94dfddce828cd9222e4b9e7825b (diff) |
mmc: initialize struct mmc_request at declaration time
Converts from:
struct mmc_request mrq;
memset(&mrq, 0, sizeof(struct mmc_request));
to:
struct mmc_request mrq = {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/sd_ops.c')
-rw-r--r-- | drivers/mmc/core/sd_ops.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c index 8023f580b901..a206aea5360d 100644 --- a/drivers/mmc/core/sd_ops.c +++ b/drivers/mmc/core/sd_ops.c | |||
@@ -66,7 +66,7 @@ static int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card) | |||
66 | int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card, | 66 | int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card, |
67 | struct mmc_command *cmd, int retries) | 67 | struct mmc_command *cmd, int retries) |
68 | { | 68 | { |
69 | struct mmc_request mrq; | 69 | struct mmc_request mrq = {0}; |
70 | 70 | ||
71 | int i, err; | 71 | int i, err; |
72 | 72 | ||
@@ -243,7 +243,7 @@ int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca) | |||
243 | int mmc_app_send_scr(struct mmc_card *card, u32 *scr) | 243 | int mmc_app_send_scr(struct mmc_card *card, u32 *scr) |
244 | { | 244 | { |
245 | int err; | 245 | int err; |
246 | struct mmc_request mrq; | 246 | struct mmc_request mrq = {0}; |
247 | struct mmc_command cmd = {0}; | 247 | struct mmc_command cmd = {0}; |
248 | struct mmc_data data = {0}; | 248 | struct mmc_data data = {0}; |
249 | struct scatterlist sg; | 249 | struct scatterlist sg; |
@@ -266,8 +266,6 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr) | |||
266 | if (data_buf == NULL) | 266 | if (data_buf == NULL) |
267 | return -ENOMEM; | 267 | return -ENOMEM; |
268 | 268 | ||
269 | memset(&mrq, 0, sizeof(struct mmc_request)); | ||
270 | |||
271 | mrq.cmd = &cmd; | 269 | mrq.cmd = &cmd; |
272 | mrq.data = &data; | 270 | mrq.data = &data; |
273 | 271 | ||
@@ -304,7 +302,7 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr) | |||
304 | int mmc_sd_switch(struct mmc_card *card, int mode, int group, | 302 | int mmc_sd_switch(struct mmc_card *card, int mode, int group, |
305 | u8 value, u8 *resp) | 303 | u8 value, u8 *resp) |
306 | { | 304 | { |
307 | struct mmc_request mrq; | 305 | struct mmc_request mrq = {0}; |
308 | struct mmc_command cmd = {0}; | 306 | struct mmc_command cmd = {0}; |
309 | struct mmc_data data = {0}; | 307 | struct mmc_data data = {0}; |
310 | struct scatterlist sg; | 308 | struct scatterlist sg; |
@@ -317,8 +315,6 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group, | |||
317 | mode = !!mode; | 315 | mode = !!mode; |
318 | value &= 0xF; | 316 | value &= 0xF; |
319 | 317 | ||
320 | memset(&mrq, 0, sizeof(struct mmc_request)); | ||
321 | |||
322 | mrq.cmd = &cmd; | 318 | mrq.cmd = &cmd; |
323 | mrq.data = &data; | 319 | mrq.data = &data; |
324 | 320 | ||
@@ -351,7 +347,7 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group, | |||
351 | int mmc_app_sd_status(struct mmc_card *card, void *ssr) | 347 | int mmc_app_sd_status(struct mmc_card *card, void *ssr) |
352 | { | 348 | { |
353 | int err; | 349 | int err; |
354 | struct mmc_request mrq; | 350 | struct mmc_request mrq = {0}; |
355 | struct mmc_command cmd = {0}; | 351 | struct mmc_command cmd = {0}; |
356 | struct mmc_data data = {0}; | 352 | struct mmc_data data = {0}; |
357 | struct scatterlist sg; | 353 | struct scatterlist sg; |
@@ -366,8 +362,6 @@ int mmc_app_sd_status(struct mmc_card *card, void *ssr) | |||
366 | if (err) | 362 | if (err) |
367 | return err; | 363 | return err; |
368 | 364 | ||
369 | memset(&mrq, 0, sizeof(struct mmc_request)); | ||
370 | |||
371 | mrq.cmd = &cmd; | 365 | mrq.cmd = &cmd; |
372 | mrq.data = &data; | 366 | mrq.data = &data; |
373 | 367 | ||