Acked-by: Jaehoon Chung <jh80.ch...@samsung.com> On 03/03/2012 09:46 AM, Mark Brown wrote:
> 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 <broo...@opensource.wolfsonmicro.com> > --- > drivers/mmc/host/sdhci-s3c.c | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index ea0767e..46152d6 100644 > --- a/drivers/mmc/host/sdhci-s3c.c > +++ b/drivers/mmc/host/sdhci-s3c.c > @@ -22,6 +22,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_gpio.h> > +#include <linux/pm.h> > > #include <linux/mmc/host.h> > > @@ -807,8 +808,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); > @@ -822,10 +822,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) -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html