From e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:29 -0700 Subject: [PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi This fixes u32 vs. pm_message_t in drivers/mmc, drivers/mtd and drivers/scsi. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/mmc/mmc.c | 2 +- drivers/mmc/mmci.c | 2 +- drivers/mmc/pxamci.c | 2 +- drivers/mmc/wbsd.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/mmc') diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index e4002632825..eeb9f6668e6 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host); * @host: mmc host * @state: suspend mode (PM_SUSPEND_xxx) */ -int mmc_suspend_host(struct mmc_host *host, u32 state) +int mmc_suspend_host(struct mmc_host *host, pm_message_t state) { mmc_claim_host(host); mmc_deselect_cards(host); diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 3ee961c206b..3a5f6ac5b36 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c @@ -603,7 +603,7 @@ static int mmci_remove(struct amba_device *dev) } #ifdef CONFIG_PM -static int mmci_suspend(struct amba_device *dev, u32 state) +static int mmci_suspend(struct amba_device *dev, pm_message_t state) { struct mmc_host *mmc = amba_get_drvdata(dev); int ret = 0; diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index f76deedf535..b78beb1b015 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -558,7 +558,7 @@ static int pxamci_remove(struct device *dev) } #ifdef CONFIG_PM -static int pxamci_suspend(struct device *dev, u32 state, u32 level) +static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level) { struct mmc_host *mmc = dev_get_drvdata(dev); int ret = 0; diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 938bca0414e..39747526c71 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* dev) */ #ifdef CONFIG_PM -static int wbsd_suspend(struct device *dev, u32 state, u32 level) +static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level) { DBGF("Not yet supported\n"); -- cgit v1.2.3-70-g09d2