Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dcb52cb authored by Andreas Ruprecht's avatar Andreas Ruprecht Committed by Rafael J. Wysocki
Browse files

ACPI / PM: Remove unneeded nested #ifdef 



In commit 5de21bb9 ("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: default avatarAndreas Ruprecht <rupran@einserver.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f6a55884

drivers/acpi/device_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -1027,7 +1027,6 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze); 


static struct dev_pm_domain acpi_general_pm_domain = {

	.ops = {

#ifdef CONFIG_PM

		.runtime_suspend = acpi_subsys_runtime_suspend,

		.runtime_resume = acpi_subsys_runtime_resume,

#ifdef CONFIG_PM_SLEEP
@@ -1040,7 +1039,6 @@ static struct dev_pm_domain acpi_general_pm_domain = { 
		.poweroff = acpi_subsys_suspend,

		.poweroff_late = acpi_subsys_suspend_late,

		.restore_early = acpi_subsys_resume_early,

#endif

#endif

	},

};