2009-04-20 18:45:24

by Rabin Vincent

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

Fix usage of obsolete parameters and functions in the driver's PM
callbacks.

Signed-off-by: Rabin Vincent <[email protected]>
---
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

2009-04-20 23:26:48

by Nicolas Pitre

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

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 <[email protected]>

Acked-by: Nicolas Pitre <[email protected]>


> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2009-04-28 19:37:41

by Pierre Ossman

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

On Mon, 20 Apr 2009 19:26:32 -0400 (EDT)
Nicolas Pitre <[email protected]> wrote:

> 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 <[email protected]>
>
> Acked-by: Nicolas Pitre <[email protected]>

Queued, thanks.

--
-- Pierre Ossman

Linux kernel, MMC maintainer http://www.kernel.org
rdesktop, core developer http://www.rdesktop.org
TigerVNC, core developer http://www.tigervnc.org

WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.