Commit d5e9c02c authored by Mark Brown's avatar Mark Brown Committed by Chris Ball

mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9bda6da7
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
#include <linux/pm.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
...@@ -658,8 +661,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) ...@@ -658,8 +661,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sdhci_s3c_suspend(struct device *dev) static int sdhci_s3c_suspend(struct device *dev)
{ {
struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_host *host = dev_get_drvdata(dev);
...@@ -673,10 +675,11 @@ static int sdhci_s3c_resume(struct device *dev) ...@@ -673,10 +675,11 @@ static int sdhci_s3c_resume(struct device *dev)
return sdhci_resume_host(host); return sdhci_resume_host(host);
} }
#endif
#ifdef CONFIG_PM
static const struct dev_pm_ops sdhci_s3c_pmops = { static const struct dev_pm_ops sdhci_s3c_pmops = {
.suspend = sdhci_s3c_suspend, SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume)
.resume = sdhci_s3c_resume,
}; };
#define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops) #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment