diff options
| author | Pavel Machek <pavel@suse.cz> | 2005-03-29 17:44:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-29 17:44:51 -0800 |
| commit | 165929bd1140d2f3353e5f02db79ed9b1179b4ea (patch) | |
| tree | 966251974f4dde6a02b81758829543ac4d8c8cb2 | |
| parent | 820807d24e07ba93ffd773bd2d1eabf9c7099d87 (diff) | |
| download | history-165929bd1140d2f3353e5f02db79ed9b1179b4ea.tar.gz | |
[PATCH] Fix u32 vs. pm_message_t confusion in MMC
This fixes u32 vs. pm_message_t confusion in MMC layer.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/mmc/mmc_block.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/mmc_sysfs.c | 2 | ||||
| -rw-r--r-- | include/linux/mmc/card.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index ea2927ee4085b..b5b4a7b119034 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c @@ -437,7 +437,7 @@ static void mmc_blk_remove(struct mmc_card *card) } #ifdef CONFIG_PM -static int mmc_blk_suspend(struct mmc_card *card, u32 state) +static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state) { struct mmc_blk_data *md = mmc_get_drvdata(card); diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c index 939a81fba028e..29a56e9cd5b3a 100644 --- a/drivers/mmc/mmc_sysfs.c +++ b/drivers/mmc/mmc_sysfs.c @@ -109,7 +109,7 @@ mmc_bus_hotplug(struct device *dev, char **envp, int num_envp, char *buf, return 0; } -static int mmc_bus_suspend(struct device *dev, u32 state) +static int mmc_bus_suspend(struct device *dev, pm_message_t state) { struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_card *card = dev_to_mmc_card(dev); diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 44da5ac8f88f9..aefedf04b9bb2 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -75,7 +75,7 @@ struct mmc_driver { struct device_driver drv; int (*probe)(struct mmc_card *); void (*remove)(struct mmc_card *); - int (*suspend)(struct mmc_card *, u32); + int (*suspend)(struct mmc_card *, pm_message_t); int (*resume)(struct mmc_card *); }; |