From: Vinod Koul <vinod.koul@intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: dmaengine@vger.kernel.org, Laxman Dewangan <ldewangan@nvidia.com>,
Dan Williams <dan.j.williams@intel.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Courbot <gnurou@gmail.com>,
Linux PM list <linux-pm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] DMA / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Date: Fri, 5 Dec 2014 20:02:18 +0530 [thread overview]
Message-ID: <20141205143218.GH3411@intel.com> (raw)
In-Reply-To: <2237445.kkHAuggnGG@vostro.rjw.lan>
On Wed, Dec 03, 2014 at 02:44:08AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
> selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
> depending on CONFIG_PM_RUNTIME may now be changed to depend on
> CONFIG_PM.
>
> Replace CONFIG_PM_RUNTIME with CONFIG_PM in drivers/dma/nbpfaxi.c
> and drivers/dma/tegra20-apb-dma.c.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
With change of patch title to dmaengine (we dont use DMA for dmaengine
subsystem patches)
Acked-by: Vinod Koul <vinod.koul@intel.com>
--
~Vinod
> ---
>
> Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
> PM_SLEEP is selected) which is only in linux-next at the moment (via the
> linux-pm tree).
>
> Please let me know if it is OK to take this one into linux-pm.
>
> ---
> drivers/dma/nbpfaxi.c | 2 +-
> drivers/dma/tegra20-apb-dma.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/dma/nbpfaxi.c
> ===================================================================
> --- linux-pm.orig/drivers/dma/nbpfaxi.c
> +++ linux-pm/drivers/dma/nbpfaxi.c
> @@ -1479,7 +1479,7 @@ static struct platform_device_id nbpf_id
> };
> MODULE_DEVICE_TABLE(platform, nbpf_ids);
>
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
> static int nbpf_runtime_suspend(struct device *dev)
> {
> struct nbpf_device *nbpf = platform_get_drvdata(to_platform_device(dev));
> Index: linux-pm/drivers/dma/tegra20-apb-dma.c
> ===================================================================
> --- linux-pm.orig/drivers/dma/tegra20-apb-dma.c
> +++ linux-pm/drivers/dma/tegra20-apb-dma.c
> @@ -1587,7 +1587,7 @@ static int tegra_dma_pm_resume(struct de
> #endif
>
> static const struct dev_pm_ops tegra_dma_dev_pm_ops = {
> -#ifdef CONFIG_PM_RUNTIME
> +#ifdef CONFIG_PM
> .runtime_suspend = tegra_dma_runtime_suspend,
> .runtime_resume = tegra_dma_runtime_resume,
> #endif
>
--
prev parent reply other threads:[~2014-12-05 14:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 1:44 [PATCH] DMA / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-05 14:32 ` Vinod Koul [this message]
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=20141205143218.GH3411@intel.com \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=gnurou@gmail.com \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).