PM / ACPI: Remove references to pm_flags from bus.c

If direct references to pm_flags are removed from drivers/acpi/bus.c,
CONFIG_ACPI will not need to depend on CONFIG_PM any more.  Make that
happen.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2aa042a5da6d06c05e29de99419e0322c77414a6..3a17ca5fff6f022d207107ff741b6b22ba300190 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -7,7 +7,6 @@ menuconfig ACPI
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on PCI
-       depends on PM
        select PNP
        default y
        help

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 7ced61f394924e3e0eeb208de094f894cfd5e623..973b0709972c8ad3fddfe4ffaf56e046d47e643b 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -40,6 +40,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/dmi.h>
+#include <linux/suspend.h>
 
 #include "internal.h"
 
@@ -1025,13 +1026,13 @@ static int __init acpi_init(void)
 
        if (!result) {
                pci_mmcfg_late_init();
-               if (!(pm_flags & PM_APM))
-                       pm_flags |= PM_ACPI;
-               else {
+               if (pm_apm_enabled()) {
                        printk(KERN_INFO PREFIX
                               "APM is already active, exiting\n");
                        disable_acpi();
                        result = -ENODEV;
+               } else {
+                       pm_set_acpi_flag();
                }
        } else
                disable_acpi();

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 5a89e3612875b017760d365c99113a5e76c0d61f..5e364db8a56ab069c69209d740e49c7912503fb1 100644 (file)
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -272,6 +272,9 @@ extern int unregister_pm_notifier(struct notifier_block *nb);
        register_pm_notifier(&fn##_nb);                 \
 }
 
+extern bool pm_apm_enabled(void);
+extern void pm_set_acpi_flag(void);
+
 /* drivers/base/power/wakeup.c */
 extern bool events_check_enabled;
 
@@ -292,6 +295,9 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)
 
 #define pm_notifier(fn, pri)   do { (void)(fn); } while (0)
 
+static inline bool pm_apm_enabled(void) { return false; }
+static inline void pm_set_acpi_flag(void) {}
+
 static inline bool pm_wakeup_pending(void) { return false; }
 #endif /* !CONFIG_PM_SLEEP */
 

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 701853042c281c010303a1230f42b6fa5a08cae0..b5405af48ddb3e9a7bb1561369afd568158c37d2 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -17,10 +17,20 @@
 
 DEFINE_MUTEX(pm_mutex);
 
+#ifdef CONFIG_PM_SLEEP
+
 unsigned int pm_flags;
 EXPORT_SYMBOL(pm_flags);
 
-#ifdef CONFIG_PM_SLEEP
+bool pm_apm_enabled(void)
+{
+       return !!(pm_flags & PM_APM);
+}
+
+void pm_set_acpi_flag(void)
+{
+       pm_flags |= PM_ACPI;
+}
 
 /* Routines for PM-transition notifications */