diff options
author | Andreas Ruprecht <rupran@einserver.de> | 2015-02-08 08:12:59 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-08 17:45:58 -0500 |
commit | 8dcb52cbcadf7cbee62a7723f8a588a31281eccd (patch) | |
tree | 5984b7061b16f9a32f544ab8cc2963c636ddd331 | |
parent | f6a55884d76c5f493538866793fddd47b4ecf646 (diff) |
ACPI / PM: Remove unneeded nested #ifdef
In commit 5de21bb998b8 ("ACPI / PM: Drop CONFIG_PM_RUNTIME from the
ACPI core"), all occurrences of CONFIG_PM_RUNTIME were replaced with
CONFIG_PM. This created the following structure of #ifdef blocks in
the code:
[...]
#ifdef CONFIG_PM
#ifdef CONFIG_PM
/* always on / undead */
#ifdef CONFIG_PM_SLEEP
[...]
#endif
#endif
[...]
#endif
This patch removes the inner "#ifdef CONFIG_PM" block as it will
always be enabled when the outer block is enabled. This inconsistency
was found using the undertaker-checkpatch tool.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/device_pm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index c0d44d394ca3..735db11a9b00 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c | |||
@@ -1027,7 +1027,6 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze); | |||
1027 | 1027 | ||
1028 | static struct dev_pm_domain acpi_general_pm_domain = { | 1028 | static struct dev_pm_domain acpi_general_pm_domain = { |
1029 | .ops = { | 1029 | .ops = { |
1030 | #ifdef CONFIG_PM | ||
1031 | .runtime_suspend = acpi_subsys_runtime_suspend, | 1030 | .runtime_suspend = acpi_subsys_runtime_suspend, |
1032 | .runtime_resume = acpi_subsys_runtime_resume, | 1031 | .runtime_resume = acpi_subsys_runtime_resume, |
1033 | #ifdef CONFIG_PM_SLEEP | 1032 | #ifdef CONFIG_PM_SLEEP |
@@ -1041,7 +1040,6 @@ static struct dev_pm_domain acpi_general_pm_domain = { | |||
1041 | .poweroff_late = acpi_subsys_suspend_late, | 1040 | .poweroff_late = acpi_subsys_suspend_late, |
1042 | .restore_early = acpi_subsys_resume_early, | 1041 | .restore_early = acpi_subsys_resume_early, |
1043 | #endif | 1042 | #endif |
1044 | #endif | ||
1045 | }, | 1043 | }, |
1046 | }; | 1044 | }; |
1047 | 1045 | ||