Skip to contentSkip to conversation

mvsdio: fix CONFIG_PM=y build

PATCH Applied Rabin Vincent 3 participants 3 messages Apr 20, 2009 – Apr 28, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mvsdio: fix CONFIG_PM=y build

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

---
 drivers/mmc/host/mvsdio.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/mmc/host/mvsdio.c +5 -6
index b5c375d..c643d0f 100644
@@ -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;
Signature · 1 line
1.6.2.2
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Rabin Vincent

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

Quoted 47 lines
---
 drivers/mmc/host/mvsdio.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/mmc/host/mvsdio.c +5 -6
index b5c375d..c643d0f 100644
@@ -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;
Signature · 7 lines
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/
#2 lore raw
Quoted 8 lines · On Mon, 20 Apr 2009 19:26:32 -0400 (EDT) Nicolas Pitre <[email protected]> wrote:
Quoted 4 lines · Rabin Vincent

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

Queued, thanks.

Signature · 10 lines
     -- 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.