Skip to content

Commit

Permalink
mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown authored and Chris Ball committed Apr 6, 2012
1 parent 9bda6da commit d5e9c02
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/mmc/host/sdhci-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit d5e9c02

Please sign in to comment.