aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-12 18:42:49 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-12 18:42:49 -0500
commitbf7c5449e6240c510df5fafcffd8b7bfd9f8e831 (patch)
tree72b70be8824430600604198ced2209b94f64d9fd
parent641d334b29429f1d191b4bb4295f7a259b1660cc (diff)
ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
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 everywhere in the code under arch/arm/ (the defconfig files will be modified later). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
-rw-r--r--arch/arm/kernel/perf_event.c2
-rw-r--r--arch/arm/mach-davinci/pm_domain.c2
-rw-r--r--arch/arm/mach-keystone/pm_domain.c2
-rw-r--r--arch/arm/mach-omap1/pm_bus.c4
-rw-r--r--arch/arm/mach-omap2/io.c2
-rw-r--r--arch/arm/mach-omap2/omap_device.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index e34934f63a49..f7c65adaa428 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu)
484 armpmu->stop(armpmu); 484 armpmu->stop(armpmu);
485} 485}
486 486
487#ifdef CONFIG_PM_RUNTIME 487#ifdef CONFIG_PM
488static int armpmu_runtime_resume(struct device *dev) 488static int armpmu_runtime_resume(struct device *dev)
489{ 489{
490 struct arm_pmu_platdata *plat = dev_get_platdata(dev); 490 struct arm_pmu_platdata *plat = dev_get_platdata(dev);
diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c
index 6b98413cebd6..641edc313938 100644
--- a/arch/arm/mach-davinci/pm_domain.c
+++ b/arch/arm/mach-davinci/pm_domain.c
@@ -14,7 +14,7 @@
14#include <linux/pm_clock.h> 14#include <linux/pm_clock.h>
15#include <linux/platform_device.h> 15#include <linux/platform_device.h>
16 16
17#ifdef CONFIG_PM_RUNTIME 17#ifdef CONFIG_PM
18static int davinci_pm_runtime_suspend(struct device *dev) 18static int davinci_pm_runtime_suspend(struct device *dev)
19{ 19{
20 int ret; 20 int ret;
diff --git a/arch/arm/mach-keystone/pm_domain.c b/arch/arm/mach-keystone/pm_domain.c
index ca79ddac38bc..ef6041e7e675 100644
--- a/arch/arm/mach-keystone/pm_domain.c
+++ b/arch/arm/mach-keystone/pm_domain.c
@@ -19,7 +19,7 @@
19#include <linux/clk-provider.h> 19#include <linux/clk-provider.h>
20#include <linux/of.h> 20#include <linux/of.h>
21 21
22#ifdef CONFIG_PM_RUNTIME 22#ifdef CONFIG_PM
23static int keystone_pm_runtime_suspend(struct device *dev) 23static int keystone_pm_runtime_suspend(struct device *dev)
24{ 24{
25 int ret; 25 int ret;
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 3f2d39672393..c40e209de65c 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -21,7 +21,7 @@
21 21
22#include "soc.h" 22#include "soc.h"
23 23
24#ifdef CONFIG_PM_RUNTIME 24#ifdef CONFIG_PM
25static int omap1_pm_runtime_suspend(struct device *dev) 25static int omap1_pm_runtime_suspend(struct device *dev)
26{ 26{
27 int ret; 27 int ret;
@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = {
59#define OMAP1_PM_DOMAIN (&default_pm_domain) 59#define OMAP1_PM_DOMAIN (&default_pm_domain)
60#else 60#else
61#define OMAP1_PM_DOMAIN NULL 61#define OMAP1_PM_DOMAIN NULL
62#endif /* CONFIG_PM_RUNTIME */ 62#endif /* CONFIG_PM */
63 63
64static struct pm_clk_notifier_block platform_bus_notifier = { 64static struct pm_clk_notifier_block platform_bus_notifier = {
65 .pm_domain = OMAP1_PM_DOMAIN, 65 .pm_domain = OMAP1_PM_DOMAIN,
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 4fc838354e31..a1bd6affb508 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -361,7 +361,7 @@ static void __init omap_hwmod_init_postsetup(void)
361 u8 postsetup_state; 361 u8 postsetup_state;
362 362
363 /* Set the default postsetup state for all hwmods */ 363 /* Set the default postsetup state for all hwmods */
364#ifdef CONFIG_PM_RUNTIME 364#ifdef CONFIG_PM
365 postsetup_state = _HWMOD_STATE_IDLE; 365 postsetup_state = _HWMOD_STATE_IDLE;
366#else 366#else
367 postsetup_state = _HWMOD_STATE_ENABLED; 367 postsetup_state = _HWMOD_STATE_ENABLED;
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 8c58b71c2727..be9541e18650 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -588,7 +588,7 @@ odbs_exit:
588 return ERR_PTR(ret); 588 return ERR_PTR(ret);
589} 589}
590 590
591#ifdef CONFIG_PM_RUNTIME 591#ifdef CONFIG_PM
592static int _od_runtime_suspend(struct device *dev) 592static int _od_runtime_suspend(struct device *dev)
593{ 593{
594 struct platform_device *pdev = to_platform_device(dev); 594 struct platform_device *pdev = to_platform_device(dev);