Re: [PATCH] mvsdio: fix CONFIG_PM=y build

From: Nicolas Pitre
Date: Mon Apr 20 2009 - 19:26:49 EST


On Tue, 21 Apr 2009, Rabin Vincent wrote:

> Fix usage of obsolete parameters and functions in the driver's PM
> callbacks.
>
> Signed-off-by: Rabin Vincent <rabin@xxxxxx>

Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>


> ---
> 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 b5c375d..c643d0f 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;
> --
> 1.6.2.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/