ACPI / PM: Remove unneeded nested #ifdef
In commit 5de21bb998
("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>
This commit is contained in:
parent
f6a55884d7
commit
8dcb52cbca
|
@ -1027,7 +1027,6 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
|
||||||
|
|
||||||
static struct dev_pm_domain acpi_general_pm_domain = {
|
static struct dev_pm_domain acpi_general_pm_domain = {
|
||||||
.ops = {
|
.ops = {
|
||||||
#ifdef CONFIG_PM
|
|
||||||
.runtime_suspend = acpi_subsys_runtime_suspend,
|
.runtime_suspend = acpi_subsys_runtime_suspend,
|
||||||
.runtime_resume = acpi_subsys_runtime_resume,
|
.runtime_resume = acpi_subsys_runtime_resume,
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
@ -1040,7 +1039,6 @@ static struct dev_pm_domain acpi_general_pm_domain = {
|
||||||
.poweroff = acpi_subsys_suspend,
|
.poweroff = acpi_subsys_suspend,
|
||||||
.poweroff_late = acpi_subsys_suspend_late,
|
.poweroff_late = acpi_subsys_suspend_late,
|
||||||
.restore_early = acpi_subsys_resume_early,
|
.restore_early = acpi_subsys_resume_early,
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue