diff options
| author | Tony Lin <tony.lin@freescale.com> | 2012-02-08 15:42:24 +0800 |
|---|---|---|
| committer | Tony Lin <tony.lin@freescale.com> | 2012-02-08 15:47:05 +0800 |
| commit | c06e6207702bce331b08d0b4e7d76cc6e51e2346 (patch) | |
| tree | 9a52b5c46dfed3adb7b5641fbc64db1cb3ae9291 | |
| parent | 21bb9372a8cdf1eeca0537280b76433a1269b3f0 (diff) | |
ENGR00174038 [mx6 mmc]fix build err
fix build error:
incompatible pointer type
Signed-off-by: Tony Lin <tony.lin@freescale.com>
| -rw-r--r-- | drivers/mmc/card/block.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/core/bus.c | 4 | ||||
| -rw-r--r-- | include/linux/mmc/card.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index f85e42224559..baae12af6513 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1305,7 +1305,7 @@ static void mmc_blk_remove(struct mmc_card *card) } #ifdef CONFIG_PM -static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state) +static int mmc_blk_suspend(struct mmc_card *card) { struct mmc_blk_data *part_md; struct mmc_blk_data *md = mmc_get_drvdata(card); diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 56eb05649bff..838286afe605 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -120,14 +120,14 @@ static int mmc_bus_remove(struct device *dev) return 0; } -static int mmc_bus_suspend(struct device *dev, pm_message_t state) +static int mmc_bus_suspend(struct device *dev) { struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_card *card = mmc_dev_to_card(dev); int ret = 0; if (dev->driver && drv->suspend) - ret = drv->suspend(card, state); + ret = drv->suspend(card); return ret; } diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 686434404651..b8ed8398240b 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -401,7 +401,7 @@ struct mmc_driver { struct device_driver drv; int (*probe)(struct mmc_card *); void (*remove)(struct mmc_card *); - int (*suspend)(struct mmc_card *, pm_message_t); + int (*suspend)(struct mmc_card *); int (*resume)(struct mmc_card *); }; |