Skip to content

Commit

Permalink
PM / ACPI: Remove references to pm_flags from bus.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Mar 14, 2011
1 parent cb8f51b commit cd51e61
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
1 change: 0 additions & 1 deletion drivers/acpi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions drivers/acpi/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions include/linux/suspend.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 */

Expand Down
12 changes: 11 additions & 1 deletion kernel/power/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit cd51e61

Please sign in to comment.