summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrygorii Strashko <Grygorii.Strashko@linaro.org>2015-01-14 16:05:00 +0200
committerGrygorii Strashko <Grygorii.Strashko@linaro.org>2015-02-09 23:28:40 +0800
commit4ae3a72d178e487dfa6844c0d0b5e2b60be6935e (patch)
tree44a32068ebda25c326090dc260bbefe95ea5f0cb
parent8841cb218c60d6b74899b34e35533be9355343c4 (diff)
[hib-new-ti] mmc: omap_hsmmc: add hibernation callbacks
Setting a dev_pm_ops suspend/resume pair but not a set of hibernation functions means those pm functions will not be called upon hibernation. Fix this by using SET_SYSTEM_SLEEP_PM_OPS, which appropriately assigns the suspend and hibernation handlers. Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a458396617d..eb6bcecffd2 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2658,7 +2658,8 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
+
static int omap_hsmmc_prepare(struct device *dev)
{
struct omap_hsmmc_host *host = dev_get_drvdata(dev);
@@ -2775,8 +2776,7 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
}
static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
- .suspend = omap_hsmmc_suspend,
- .resume = omap_hsmmc_resume,
+ SET_SYSTEM_SLEEP_PM_OPS(omap_hsmmc_suspend, omap_hsmmc_resume)
.prepare = omap_hsmmc_prepare,
.complete = omap_hsmmc_complete,
.runtime_suspend = omap_hsmmc_runtime_suspend,