Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit ee343504 authored Dec 05, 2014 by Rafael J. Wysocki

dmaengine / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM



After commit b2b49ccb (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>
Acked-by: Vinod Koul <vinod.koul@intel.com>

parent 300be5b9

drivers/dma/nbpfaxi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1479,7 +1479,7 @@ static struct platform_device_id nbpf_ids[] = {
		};
		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

Original line number	Diff line number	Diff line
		@@ -1587,7 +1587,7 @@ static int tegra_dma_pm_resume(struct device *dev)
		#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