Skip to content

Commit

Permalink
mvsdio: fix CONFIG_PM=y build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rabin Vincent authored and Pierre Ossman committed May 3, 2009
1 parent 4ea580f commit 2e058a6
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/mmc/host/mvsdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2e058a6

Please sign in to comment.