diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:29 -0400 |
commit | e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc (patch) | |
tree | 27dd779f05409b4f7ee91569ad009224729ccbb2 /drivers/mmc | |
parent | 8d189f729829369edb2e797e9a6ebc2b01b359d0 (diff) |
[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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/mmc.c | 2 | ||||
-rw-r--r-- | drivers/mmc/mmci.c | 2 | ||||
-rw-r--r-- | drivers/mmc/pxamci.c | 2 | ||||
-rw-r--r-- | drivers/mmc/wbsd.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index e40026328251..eeb9f6668e69 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
@@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host); | |||
884 | * @host: mmc host | 884 | * @host: mmc host |
885 | * @state: suspend mode (PM_SUSPEND_xxx) | 885 | * @state: suspend mode (PM_SUSPEND_xxx) |
886 | */ | 886 | */ |
887 | int mmc_suspend_host(struct mmc_host *host, u32 state) | 887 | int mmc_suspend_host(struct mmc_host *host, pm_message_t state) |
888 | { | 888 | { |
889 | mmc_claim_host(host); | 889 | mmc_claim_host(host); |
890 | mmc_deselect_cards(host); | 890 | mmc_deselect_cards(host); |
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 3ee961c206bd..3a5f6ac5b364 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
@@ -603,7 +603,7 @@ static int mmci_remove(struct amba_device *dev) | |||
603 | } | 603 | } |
604 | 604 | ||
605 | #ifdef CONFIG_PM | 605 | #ifdef CONFIG_PM |
606 | static int mmci_suspend(struct amba_device *dev, u32 state) | 606 | static int mmci_suspend(struct amba_device *dev, pm_message_t state) |
607 | { | 607 | { |
608 | struct mmc_host *mmc = amba_get_drvdata(dev); | 608 | struct mmc_host *mmc = amba_get_drvdata(dev); |
609 | int ret = 0; | 609 | int ret = 0; |
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index f76deedf5355..b78beb1b0159 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
@@ -558,7 +558,7 @@ static int pxamci_remove(struct device *dev) | |||
558 | } | 558 | } |
559 | 559 | ||
560 | #ifdef CONFIG_PM | 560 | #ifdef CONFIG_PM |
561 | static int pxamci_suspend(struct device *dev, u32 state, u32 level) | 561 | static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level) |
562 | { | 562 | { |
563 | struct mmc_host *mmc = dev_get_drvdata(dev); | 563 | struct mmc_host *mmc = dev_get_drvdata(dev); |
564 | int ret = 0; | 564 | int ret = 0; |
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 938bca0414e5..39747526c719 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
@@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* dev) | |||
1563 | */ | 1563 | */ |
1564 | 1564 | ||
1565 | #ifdef CONFIG_PM | 1565 | #ifdef CONFIG_PM |
1566 | static int wbsd_suspend(struct device *dev, u32 state, u32 level) | 1566 | static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level) |
1567 | { | 1567 | { |
1568 | DBGF("Not yet supported\n"); | 1568 | DBGF("Not yet supported\n"); |
1569 | 1569 | ||