aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkatraman S <svenkatr@ti.com>2011-08-24 15:00:50 -0400
committerChris Ball <cjb@laptop.org>2011-10-26 15:43:35 -0400
commitad5fd97288655b5628052c1fa906419417c86100 (patch)
tree996861c513fca1491f6b33e20309a2d48310b582
parent7513cd7af8df412d05349c5e44dc7638974211d8 (diff)
mmc: fix integer assignments to pointer
Fix the sparse warning output "warning: Using plain integer as NULL pointer" Signed-off-by: Venkatraman S <svenkatr@ti.com> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/card/block.c4
-rw-r--r--drivers/mmc/core/core.c2
-rw-r--r--drivers/mmc/core/mmc_ops.c4
-rw-r--r--drivers/mmc/core/sd_ops.c8
-rw-r--r--drivers/mmc/core/sdio_ops.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 4c1a648d00fc..9b9072636687 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -291,7 +291,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
291 struct mmc_card *card; 291 struct mmc_card *card;
292 struct mmc_command cmd = {0}; 292 struct mmc_command cmd = {0};
293 struct mmc_data data = {0}; 293 struct mmc_data data = {0};
294 struct mmc_request mrq = {0}; 294 struct mmc_request mrq = {NULL};
295 struct scatterlist sg; 295 struct scatterlist sg;
296 int err; 296 int err;
297 297
@@ -466,7 +466,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
466 u32 result; 466 u32 result;
467 __be32 *blocks; 467 __be32 *blocks;
468 468
469 struct mmc_request mrq = {0}; 469 struct mmc_request mrq = {NULL};
470 struct mmc_command cmd = {0}; 470 struct mmc_command cmd = {0};
471 struct mmc_data data = {0}; 471 struct mmc_data data = {0};
472 unsigned int timeout_us; 472 unsigned int timeout_us;
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index eb3069dfea8e..557856b6f95c 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -371,7 +371,7 @@ EXPORT_SYMBOL(mmc_wait_for_req);
371 */ 371 */
372int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries) 372int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries)
373{ 373{
374 struct mmc_request mrq = {0}; 374 struct mmc_request mrq = {NULL};
375 375
376 WARN_ON(!host->claimed); 376 WARN_ON(!host->claimed);
377 377
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 770c3d06f5dc..7aa13d01a835 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -233,7 +233,7 @@ static int
233mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, 233mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
234 u32 opcode, void *buf, unsigned len) 234 u32 opcode, void *buf, unsigned len)
235{ 235{
236 struct mmc_request mrq = {0}; 236 struct mmc_request mrq = {NULL};
237 struct mmc_command cmd = {0}; 237 struct mmc_command cmd = {0};
238 struct mmc_data data = {0}; 238 struct mmc_data data = {0};
239 struct scatterlist sg; 239 struct scatterlist sg;
@@ -454,7 +454,7 @@ static int
454mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode, 454mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
455 u8 len) 455 u8 len)
456{ 456{
457 struct mmc_request mrq = {0}; 457 struct mmc_request mrq = {NULL};
458 struct mmc_command cmd = {0}; 458 struct mmc_command cmd = {0};
459 struct mmc_data data = {0}; 459 struct mmc_data data = {0};
460 struct scatterlist sg; 460 struct scatterlist sg;
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index 021fed153804..46a785419fab 100644
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(mmc_app_cmd);
67int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card, 67int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card,
68 struct mmc_command *cmd, int retries) 68 struct mmc_command *cmd, int retries)
69{ 69{
70 struct mmc_request mrq = {0}; 70 struct mmc_request mrq = {NULL};
71 71
72 int i, err; 72 int i, err;
73 73
@@ -244,7 +244,7 @@ int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca)
244int mmc_app_send_scr(struct mmc_card *card, u32 *scr) 244int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
245{ 245{
246 int err; 246 int err;
247 struct mmc_request mrq = {0}; 247 struct mmc_request mrq = {NULL};
248 struct mmc_command cmd = {0}; 248 struct mmc_command cmd = {0};
249 struct mmc_data data = {0}; 249 struct mmc_data data = {0};
250 struct scatterlist sg; 250 struct scatterlist sg;
@@ -303,7 +303,7 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
303int mmc_sd_switch(struct mmc_card *card, int mode, int group, 303int mmc_sd_switch(struct mmc_card *card, int mode, int group,
304 u8 value, u8 *resp) 304 u8 value, u8 *resp)
305{ 305{
306 struct mmc_request mrq = {0}; 306 struct mmc_request mrq = {NULL};
307 struct mmc_command cmd = {0}; 307 struct mmc_command cmd = {0};
308 struct mmc_data data = {0}; 308 struct mmc_data data = {0};
309 struct scatterlist sg; 309 struct scatterlist sg;
@@ -348,7 +348,7 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group,
348int mmc_app_sd_status(struct mmc_card *card, void *ssr) 348int mmc_app_sd_status(struct mmc_card *card, void *ssr)
349{ 349{
350 int err; 350 int err;
351 struct mmc_request mrq = {0}; 351 struct mmc_request mrq = {NULL};
352 struct mmc_command cmd = {0}; 352 struct mmc_command cmd = {0};
353 struct mmc_data data = {0}; 353 struct mmc_data data = {0};
354 struct scatterlist sg; 354 struct scatterlist sg;
diff --git a/drivers/mmc/core/sdio_ops.c b/drivers/mmc/core/sdio_ops.c
index f087d876c573..4addbe987bc9 100644
--- a/drivers/mmc/core/sdio_ops.c
+++ b/drivers/mmc/core/sdio_ops.c
@@ -121,7 +121,7 @@ int mmc_io_rw_direct(struct mmc_card *card, int write, unsigned fn,
121int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn, 121int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,
122 unsigned addr, int incr_addr, u8 *buf, unsigned blocks, unsigned blksz) 122 unsigned addr, int incr_addr, u8 *buf, unsigned blocks, unsigned blksz)
123{ 123{
124 struct mmc_request mrq = {0}; 124 struct mmc_request mrq = {NULL};
125 struct mmc_command cmd = {0}; 125 struct mmc_command cmd = {0};
126 struct mmc_data data = {0}; 126 struct mmc_data data = {0};
127 struct scatterlist sg; 127 struct scatterlist sg;