diff options
author | Chris Ball <cjb@laptop.org> | 2011-04-13 23:46:05 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-05-24 21:01:56 -0400 |
commit | a61ad2b49bfce94dfddce828cd9222e4b9e7825b (patch) | |
tree | 36f93e61adc7c7d7523c78c78c3df1e75fae5e33 /drivers/mmc/core/sd_ops.c | |
parent | 1278dba167f01bb3c6626d16450d31129d041087 (diff) |
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/sd_ops.c')
-rw-r--r-- | drivers/mmc/core/sd_ops.c | 9 |
1 files changed, 3 insertions, 6 deletions
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) | |||
245 | int err; | 245 | int err; |
246 | struct mmc_request mrq; | 246 | struct mmc_request mrq; |
247 | struct mmc_command cmd = {0}; | 247 | struct mmc_command cmd = {0}; |
248 | struct mmc_data data; | 248 | struct mmc_data data = {0}; |
249 | struct scatterlist sg; | 249 | struct scatterlist sg; |
250 | void *data_buf; | 250 | void *data_buf; |
251 | 251 | ||
@@ -267,7 +267,6 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr) | |||
267 | return -ENOMEM; | 267 | return -ENOMEM; |
268 | 268 | ||
269 | memset(&mrq, 0, sizeof(struct mmc_request)); | 269 | memset(&mrq, 0, sizeof(struct mmc_request)); |
270 | memset(&data, 0, sizeof(struct mmc_data)); | ||
271 | 270 | ||
272 | mrq.cmd = &cmd; | 271 | mrq.cmd = &cmd; |
273 | mrq.data = &data; | 272 | mrq.data = &data; |
@@ -307,7 +306,7 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group, | |||
307 | { | 306 | { |
308 | struct mmc_request mrq; | 307 | struct mmc_request mrq; |
309 | struct mmc_command cmd = {0}; | 308 | struct mmc_command cmd = {0}; |
310 | struct mmc_data data; | 309 | struct mmc_data data = {0}; |
311 | struct scatterlist sg; | 310 | struct scatterlist sg; |
312 | 311 | ||
313 | BUG_ON(!card); | 312 | BUG_ON(!card); |
@@ -319,7 +318,6 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group, | |||
319 | value &= 0xF; | 318 | value &= 0xF; |
320 | 319 | ||
321 | memset(&mrq, 0, sizeof(struct mmc_request)); | 320 | memset(&mrq, 0, sizeof(struct mmc_request)); |
322 | memset(&data, 0, sizeof(struct mmc_data)); | ||
323 | 321 | ||
324 | mrq.cmd = &cmd; | 322 | mrq.cmd = &cmd; |
325 | mrq.data = &data; | 323 | mrq.data = &data; |
@@ -355,7 +353,7 @@ int mmc_app_sd_status(struct mmc_card *card, void *ssr) | |||
355 | int err; | 353 | int err; |
356 | struct mmc_request mrq; | 354 | struct mmc_request mrq; |
357 | struct mmc_command cmd = {0}; | 355 | struct mmc_command cmd = {0}; |
358 | struct mmc_data data; | 356 | struct mmc_data data = {0}; |
359 | struct scatterlist sg; | 357 | struct scatterlist sg; |
360 | 358 | ||
361 | BUG_ON(!card); | 359 | BUG_ON(!card); |
@@ -369,7 +367,6 @@ int mmc_app_sd_status(struct mmc_card *card, void *ssr) | |||
369 | return err; | 367 | return err; |
370 | 368 | ||
371 | memset(&mrq, 0, sizeof(struct mmc_request)); | 369 | memset(&mrq, 0, sizeof(struct mmc_request)); |
372 | memset(&data, 0, sizeof(struct mmc_data)); | ||
373 | 370 | ||
374 | mrq.cmd = &cmd; | 371 | mrq.cmd = &cmd; |
375 | mrq.data = &data; | 372 | mrq.data = &data; |