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>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 7ced61f39492..973b0709972c 100644
--- 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();