diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-02 19:46:41 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-04-05 20:32:19 -0400 |
commit | d5e9c02cab60920d5ac16a8244bb6085dc27564f (patch) | |
tree | 93d6d1c29f9f98ada22d4a32b78d02fd32c7117b /drivers | |
parent | 9bda6da7ff7d35ef757e235aae559e679d3a9493 (diff) |
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index c3144cb21325..2ea3e6b8bd6a 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c | |||
@@ -20,6 +20,9 @@ | |||
20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/of.h> | ||
24 | #include <linux/of_gpio.h> | ||
25 | #include <linux/pm.h> | ||
23 | 26 | ||
24 | #include <linux/mmc/host.h> | 27 | #include <linux/mmc/host.h> |
25 | 28 | ||
@@ -658,8 +661,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) | |||
658 | return 0; | 661 | return 0; |
659 | } | 662 | } |
660 | 663 | ||
661 | #ifdef CONFIG_PM | 664 | #ifdef CONFIG_PM_SLEEP |
662 | |||
663 | static int sdhci_s3c_suspend(struct device *dev) | 665 | static int sdhci_s3c_suspend(struct device *dev) |
664 | { | 666 | { |
665 | struct sdhci_host *host = dev_get_drvdata(dev); | 667 | struct sdhci_host *host = dev_get_drvdata(dev); |
@@ -673,10 +675,11 @@ static int sdhci_s3c_resume(struct device *dev) | |||
673 | 675 | ||
674 | return sdhci_resume_host(host); | 676 | return sdhci_resume_host(host); |
675 | } | 677 | } |
678 | #endif | ||
676 | 679 | ||
680 | #ifdef CONFIG_PM | ||
677 | static const struct dev_pm_ops sdhci_s3c_pmops = { | 681 | static const struct dev_pm_ops sdhci_s3c_pmops = { |
678 | .suspend = sdhci_s3c_suspend, | 682 | SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume) |
679 | .resume = sdhci_s3c_resume, | ||
680 | }; | 683 | }; |
681 | 684 | ||
682 | #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops) | 685 | #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops) |