Commit bf7c5449 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ARM / 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 everywhere in the code under
arch/arm/ (the defconfig files will be modified later).
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
parent 641d334b
...@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu) ...@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu)
armpmu->stop(armpmu); armpmu->stop(armpmu);
} }
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int armpmu_runtime_resume(struct device *dev) static int armpmu_runtime_resume(struct device *dev)
{ {
struct arm_pmu_platdata *plat = dev_get_platdata(dev); struct arm_pmu_platdata *plat = dev_get_platdata(dev);
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/pm_clock.h> #include <linux/pm_clock.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int davinci_pm_runtime_suspend(struct device *dev) static int davinci_pm_runtime_suspend(struct device *dev)
{ {
int ret; int ret;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/of.h> #include <linux/of.h>
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int keystone_pm_runtime_suspend(struct device *dev) static int keystone_pm_runtime_suspend(struct device *dev)
{ {
int ret; int ret;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "soc.h" #include "soc.h"
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int omap1_pm_runtime_suspend(struct device *dev) static int omap1_pm_runtime_suspend(struct device *dev)
{ {
int ret; int ret;
...@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = { ...@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = {
#define OMAP1_PM_DOMAIN (&default_pm_domain) #define OMAP1_PM_DOMAIN (&default_pm_domain)
#else #else
#define OMAP1_PM_DOMAIN NULL #define OMAP1_PM_DOMAIN NULL
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
static struct pm_clk_notifier_block platform_bus_notifier = { static struct pm_clk_notifier_block platform_bus_notifier = {
.pm_domain = OMAP1_PM_DOMAIN, .pm_domain = OMAP1_PM_DOMAIN,
......
...@@ -361,7 +361,7 @@ static void __init omap_hwmod_init_postsetup(void) ...@@ -361,7 +361,7 @@ static void __init omap_hwmod_init_postsetup(void)
u8 postsetup_state; u8 postsetup_state;
/* Set the default postsetup state for all hwmods */ /* Set the default postsetup state for all hwmods */
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
postsetup_state = _HWMOD_STATE_IDLE; postsetup_state = _HWMOD_STATE_IDLE;
#else #else
postsetup_state = _HWMOD_STATE_ENABLED; postsetup_state = _HWMOD_STATE_ENABLED;
......
...@@ -588,7 +588,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, ...@@ -588,7 +588,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int _od_runtime_suspend(struct device *dev) static int _od_runtime_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment