[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 <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
8d189f7298
commit
e5378ca8c0
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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");
|
||||
|
||||
|
Reference in New Issue
Block a user