DMA / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Subsystems (3)
PATCH 1/1 DMA / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
From: Rafael J. Wysocki <[email protected]>
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.
---
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(-)
drivers/dma/nbpfaxi.c +1 -1
@@ -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));
drivers/dma/tegra20-apb-dma.c +1 -1
@@ -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
Quoted 11 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
After commit
b2b49ccbdd54(PM:Kconfig: SetPM_RUNTIMEifPM_SLEEPis selected)PM_RUNTIMEis always set if PM is set, so #ifdef blocks depending onCONFIG_PM_RUNTIMEmay now be changed to depend onCONFIG_PM.Replace
CONFIG_PM_RUNTIMEwithCONFIG_PMindrivers/dma/nbpfaxi.canddrivers/dma/tegra20-apb-dma.c.Signed-off-by Rafael J. Wysocki <[email protected]>
With change of patch title to dmaengine (we dont use DMA for dmaengine subsystem patches)
Signature · 1 line
~Vinod
Quoted 40 lines
---
Note: This depends on commit
b2b49ccbdd54(PM:Kconfig: SetPM_RUNTIMEifPM_SLEEPis 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
===================================================================drivers/dma/nbpfaxi.c +1
-1@@ -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
===================================================================drivers/dma/tegra20-apb-dma.c +1
-1@@ -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