ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 12 Dec 2014 23:42:49 +0000 (00:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 12 Dec 2014 23:42:49 +0000 (00:42 +0100)
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>
arch/arm/kernel/perf_event.c
arch/arm/mach-davinci/pm_domain.c
arch/arm/mach-keystone/pm_domain.c
arch/arm/mach-omap1/pm_bus.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap_device.c

index e34934f63a492d23249d91e88831566cf9c8f76c..f7c65adaa428c9eabd2c5080ae097a374c2206f5 100644 (file)
@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu)
        armpmu->stop(armpmu);
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int armpmu_runtime_resume(struct device *dev)
 {
        struct arm_pmu_platdata *plat = dev_get_platdata(dev);
index 6b98413cebd61179f100b2e77ac7237f97e6c102..641edc31393850dcb134f6c3aba2dd9924787aff 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/pm_clock.h>
 #include <linux/platform_device.h>
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int davinci_pm_runtime_suspend(struct device *dev)
 {
        int ret;
index ca79ddac38bcd6ff1e00457a858006271762c861..ef6041e7e6754c5daf8c07d7f91309f32ce4f4b1 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/clk-provider.h>
 #include <linux/of.h>
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int keystone_pm_runtime_suspend(struct device *dev)
 {
        int ret;
index 3f2d396723930ce1a27985bc3dcf48d122576e9b..c40e209de65c0fe6816a4dc31bc737335d8b71ca 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "soc.h"
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int omap1_pm_runtime_suspend(struct device *dev)
 {
        int ret;
@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = {
 #define OMAP1_PM_DOMAIN (&default_pm_domain)
 #else
 #define OMAP1_PM_DOMAIN NULL
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
        .pm_domain = OMAP1_PM_DOMAIN,
index 4fc838354e313cf7ce2ac828746c0031e9102ef0..a1bd6affb508e8a5c25b1cd550f03316e5d33bd6 100644 (file)
@@ -361,7 +361,7 @@ static void __init omap_hwmod_init_postsetup(void)
        u8 postsetup_state;
 
        /* Set the default postsetup state for all hwmods */
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
        postsetup_state = _HWMOD_STATE_IDLE;
 #else
        postsetup_state = _HWMOD_STATE_ENABLED;
index 8c58b71c2727cbf544582f9b3f6cd4fc00984035..be9541e1865096bb2c8b81659dfce952cbc98eeb 100644 (file)
@@ -588,7 +588,7 @@ odbs_exit:
        return ERR_PTR(ret);
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int _od_runtime_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);