]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 3 Mar 2012 00:46:41 +0000 (00:46 +0000)
committerChris Ball <cjb@laptop.org>
Fri, 6 Apr 2012 00:32:19 +0000 (20:32 -0400)
This matches current best practice as one can have runtime PM enabled
without system sleep and CONFIG_PM is defined for both.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci-s3c.c

index c3144cb21325bf7b17b6600d206be84967466936..2ea3e6b8bd6a8c3a8825e76c82336f50ee7af537 100644 (file)
@@ -20,6 +20,9 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/pm.h>
 
 #include <linux/mmc/host.h>
 
@@ -658,8 +661,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-
+#ifdef CONFIG_PM_SLEEP
 static int sdhci_s3c_suspend(struct device *dev)
 {
        struct sdhci_host *host = dev_get_drvdata(dev);
@@ -673,10 +675,11 @@ static int sdhci_s3c_resume(struct device *dev)
 
        return sdhci_resume_host(host);
 }
+#endif
 
+#ifdef CONFIG_PM
 static const struct dev_pm_ops sdhci_s3c_pmops = {
-       .suspend        = sdhci_s3c_suspend,
-       .resume         = sdhci_s3c_resume,
+       SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume)
 };
 
 #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops)