diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 21:08:24 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 21:08:24 -0500 |
commit | 300be5b9e152e16f6ee420ab481d1f2536794052 (patch) | |
tree | a99939ecf3c07d5ad310f1fadfa86c17e540304a | |
parent | d61c81cb68bcdd6bc3cee4fe97c71cab9afd78b6 (diff) |
drivers: sh / 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 in drivers/sh/pm_runtime.c.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
-rw-r--r-- | drivers/sh/pm_runtime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index fe2c2d595f59..f3ee439d6f0e 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/bitmap.h> | 20 | #include <linux/bitmap.h> |
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | 22 | ||
23 | #ifdef CONFIG_PM_RUNTIME | 23 | #ifdef CONFIG_PM |
24 | static int sh_pm_runtime_suspend(struct device *dev) | 24 | static int sh_pm_runtime_suspend(struct device *dev) |
25 | { | 25 | { |
26 | int ret; | 26 | int ret; |
@@ -68,7 +68,7 @@ static struct dev_pm_domain default_pm_domain = { | |||
68 | 68 | ||
69 | #define DEFAULT_PM_DOMAIN_PTR NULL | 69 | #define DEFAULT_PM_DOMAIN_PTR NULL |
70 | 70 | ||
71 | #endif /* CONFIG_PM_RUNTIME */ | 71 | #endif /* CONFIG_PM */ |
72 | 72 | ||
73 | static struct pm_clk_notifier_block platform_bus_notifier = { | 73 | static struct pm_clk_notifier_block platform_bus_notifier = { |
74 | .pm_domain = DEFAULT_PM_DOMAIN_PTR, | 74 | .pm_domain = DEFAULT_PM_DOMAIN_PTR, |