Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5378ca8 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[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: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8d189f72

drivers/mmc/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mmc/mmci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/pxamci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/wbsd.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/mtd/maps/sa1100-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int __exit sa1100_mtd_remove(struct device *dev) 
}



#ifdef CONFIG_PM

static int sa1100_mtd_suspend(struct device *dev, u32 state, u32 level)

static int sa1100_mtd_suspend(struct device *dev, pm_message_t state, u32 level)

{

	struct sa_info *info = dev_get_drvdata(dev);

	int ret = 0;