Change bfin_sdh platform driver to register pm ops using dev_pm_ops instead
of legacy pm_ops. .pm hooks call existing legacy suspend and resume interfaces
by passing in the right pm state.
Signed-off-by: Shuah Khan <shuah.kh@xxxxxxxxxxx>
---
drivers/mmc/host/bfin_sdh.c | 40 +++++++++++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 2b7f37e..d69f223 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -637,7 +637,7 @@ static int sdh_remove(struct platform_device *pdev)
}
#ifdef CONFIG_PM
-static int sdh_suspend(struct platform_device *dev, pm_message_t state)
+static int __sdh_suspend(struct platform_device *dev, pm_message_t state)
{
struct bfin_sd_host *drv_data = get_sdh_data(dev);
@@ -646,7 +646,22 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state)
return 0;
}
-static int sdh_resume(struct platform_device *dev)
+static int sdh_suspend(struct device *dev)
+{
+ return __sdh_suspend(to_platform_device(dev), PMSG_SUSPEND);
+}
+
+static int sdh_freeze(struct device *dev)
+{
+ return __sdh_suspend(to_platform_device(dev), PMSG_FREEZE);
+}
+
+static int sdh_poweroff(struct device *dev)
+{
+ return __sdh_suspend(to_platform_device(dev), PMSG_HIBERNATE);
+}
+
+static int __sdh_resume(struct platform_device *dev)
{
struct bfin_sd_host *drv_data = get_sdh_data(dev);
int ret = 0;
@@ -660,9 +675,21 @@ static int sdh_resume(struct platform_device *dev)
sdh_reset();
return ret;
}
-#else
-# define sdh_suspend NULL
-# define sdh_resume NULL
+
+static int sdh_resume(struct device *dev)
+{
+ return __sdh_resume(to_platform_device(dev));
+}
+
+static const struct dev_pm_ops sdh_dev_pm_ops = {
+ .suspend = sdh_suspend,
+ .resume = sdh_resume,
+ /* Hibernate hooks */
+ .freeze = sdh_freeze,
+ .thaw = sdh_resume,
+ .poweroff = sdh_poweroff,
+ .restore = sdh_resume,
+};
#endif
static struct platform_driver sdh_driver = {
@@ -672,6 +699,9 @@ static struct platform_driver sdh_driver = {
.resume = sdh_resume,
.driver = {
.name = DRIVER_NAME,
+#ifdef CONFIG_PM
+ .pm = &sdh_dev_pm_ops,
+#endif
},
};
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
