From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Subject: Re: [PATCH 1/2] mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend Date: Mon, 05 Mar 2012 19:24:38 +0900 Message-ID: <4F549466.5090708@samsung.com> References: <4F51697C.40408@samsung.com> <1330735602-22409-1-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout3.samsung.com ([203.254.224.33]:60070 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756473Ab2CEKYr (ORCPT ); Mon, 5 Mar 2012 05:24:47 -0500 In-reply-to: <1330735602-22409-1-git-send-email-broonie@opensource.wolfsonmicro.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Mark Brown Cc: Kukjin Kim , Chris Ball , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Acked-by: Jaehoon Chung 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 > --- > 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 > #include > #include > +#include > > #include > > @@ -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) From mboxrd@z Thu Jan 1 00:00:00 1970 From: jh80.chung@samsung.com (Jaehoon Chung) Date: Mon, 05 Mar 2012 19:24:38 +0900 Subject: [PATCH 1/2] mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend In-Reply-To: <1330735602-22409-1-git-send-email-broonie@opensource.wolfsonmicro.com> References: <4F51697C.40408@samsung.com> <1330735602-22409-1-git-send-email-broonie@opensource.wolfsonmicro.com> Message-ID: <4F549466.5090708@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Acked-by: Jaehoon Chung 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 > --- > 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 > #include > #include > +#include > > #include > > @@ -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)