ACPI / PM: Remove unneeded nested #ifdef
authorAndreas Ruprecht <rupran@einserver.de>
Sun, 8 Feb 2015 13:12:59 +0000 (14:12 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 8 Feb 2015 22:45:58 +0000 (23:45 +0100)
commit8dcb52cbcadf7cbee62a7723f8a588a31281eccd
tree5984b7061b16f9a32f544ab8cc2963c636ddd331
parentf6a55884d76c5f493538866793fddd47b4ecf646
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>
drivers/acpi/device_pm.c