From: Adrian Hunter <adrian.hunter@intel.com>
To: David Fries <david@fries.net>
Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
Chris Ball <cjb@laptop.org>, Yunpeng Gao <yunpeng.gao@intel.com>
Subject: Re: [PATCH] sdhci-pci register legacy PCI PM or runtime PM not both
Date: Mon, 21 Nov 2011 10:48:20 +0200 [thread overview]
Message-ID: <4ECA1054.6050805@intel.com> (raw)
In-Reply-To: <20111120212951.GA4577@spacedout.fries.net>
On 20/11/11 23:29, David Fries wrote:
> From: David Fries <David@Fries.net>
>
> pci_has_legacy_pm_support says to not register both legacy PM
> and runtime PM callbacks, modified ifdefs.
Hasn't this already been done in Chris mmc tree i.e.
commit f353f593fe449178a8cb01cefe559dba125ab8b1
Author: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Thu Nov 3 11:09:45 2011 +0100
mmc: sdhci: remove "state" argument from sdhci_suspend_host
Drop the "state" argument from sdhci_suspend_host. Its only user is the
PCI glue; this allows to move all SDHCI glues to use dev_pm_ops instead.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci-cns3xxx.c | 5 +----
drivers/mmc/host/sdhci-dove.c | 5 +----
drivers/mmc/host/sdhci-esdhc-imx.c | 5 +----
drivers/mmc/host/sdhci-of-esdhc.c | 5 +----
drivers/mmc/host/sdhci-of-hlwd.c | 5 +----
drivers/mmc/host/sdhci-pci.c | 26 +++++++++++++-------------
drivers/mmc/host/sdhci-pltfm.c | 18 +++++++++++-------
drivers/mmc/host/sdhci-pltfm.h | 6 ++++--
drivers/mmc/host/sdhci-pxav2.c | 5 +----
drivers/mmc/host/sdhci-pxav3.c | 5 +----
drivers/mmc/host/sdhci-s3c.c | 21 ++++++++++++++-------
drivers/mmc/host/sdhci-tegra.c | 5 +----
drivers/mmc/host/sdhci.c | 2 +-
drivers/mmc/host/sdhci.h | 2 +-
14 files changed, 52 insertions(+), 63 deletions(-)
>
> Signed-off-by: David Fries <David@Fries.net>
> Cc: linux-mmc@vger.kernel.org
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Yunpeng Gao <yunpeng.gao@intel.com>
> ---
> drivers/mmc/host/sdhci-pci.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
> index d833d9c..eca6e84 100644
> --- a/drivers/mmc/host/sdhci-pci.c
> +++ b/drivers/mmc/host/sdhci-pci.c
> @@ -991,7 +991,8 @@ static struct sdhci_ops sdhci_pci_ops = {
> * *
> \*****************************************************************************/
>
> -#ifdef CONFIG_PM
> +/* Register legacy PM or PM runtime, not both. */
> +#if defined(CONFIG_PM) && !defined(CONFIG_PM_RUNTIME)
>
> static int sdhci_pci_suspend(struct pci_dev *pdev, pm_message_t state)
> {
> @@ -1085,12 +1086,12 @@ static int sdhci_pci_resume(struct pci_dev *pdev)
> return 0;
> }
>
> -#else /* CONFIG_PM */
> +#else /* CONFIG_PM && !CONFIG_PM_RUNTIME */
>
> #define sdhci_pci_suspend NULL
> #define sdhci_pci_resume NULL
>
> -#endif /* CONFIG_PM */
> +#endif /* CONFIG_PM && !CONFIG_PM_RUNTIME */
>
> #ifdef CONFIG_PM_RUNTIME
>
next prev parent reply other threads:[~2011-11-21 8:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 21:29 [PATCH] sdhci-pci register legacy PCI PM or runtime PM not both David Fries
2011-11-21 8:48 ` Adrian Hunter [this message]
2011-11-22 0:47 ` David Fries
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ECA1054.6050805@intel.com \
--to=adrian.hunter@intel.com \
--cc=cjb@laptop.org \
--cc=david@fries.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=yunpeng.gao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.