diff options
| author | Rabin Vincent <rabin@rab.in> | 2009-04-20 20:44:54 +0200 |
|---|---|---|
| committer | Pierre Ossman <pierre@ossman.eu> | 2009-05-03 22:12:46 +0200 |
| commit | 2e058a6fb004a6b6c3eb6a219ae408f83b670598 (patch) | |
| tree | 386478ccf44e7a544e5a3e74d501d9d5f5a1f97f /drivers/mmc/host/mvsdio.c | |
| parent | mmci: fix crash with debug enabled (diff) | |
| download | linux-2e058a6fb004a6b6c3eb6a219ae408f83b670598.tar.xz linux-2e058a6fb004a6b6c3eb6a219ae408f83b670598.zip | |
mvsdio: fix CONFIG_PM=y build
Fix usage of obsolete parameters and functions in the driver's PM
callbacks.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Diffstat (limited to 'drivers/mmc/host/mvsdio.c')
| -rw-r--r-- | drivers/mmc/host/mvsdio.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index b5c375d94ab3..c643d0fe118f 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -825,24 +825,23 @@ static int __exit mvsd_remove(struct platform_device *pdev) } #ifdef CONFIG_PM -static int mvsd_suspend(struct platform_device *dev, pm_message_t state, - u32 level) +static int mvsd_suspend(struct platform_device *dev, pm_message_t state) { struct mmc_host *mmc = platform_get_drvdata(dev); int ret = 0; - if (mmc && level == SUSPEND_DISABLE) + if (mmc) ret = mmc_suspend_host(mmc, state); return ret; } -static int mvsd_resume(struct platform_device *dev, u32 level) +static int mvsd_resume(struct platform_device *dev) { - struct mmc_host *mmc = platform_dev_get_drvdata(dev); + struct mmc_host *mmc = platform_get_drvdata(dev); int ret = 0; - if (mmc && level == RESUME_ENABLE) + if (mmc) ret = mmc_resume_host(mmc); return ret; |