summaryrefslogtreecommitdiff
path: root/include/linux/pm.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-15 23:22:24 +0300
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-15 02:43:16 +0300
commit6831c6edc7b272a08dd2a6c71bb183a48fe98ae6 (patch)
treefc3ef253f12bd9f2d211271c09a5475ed19b18b0 /include/linux/pm.h
parente8665002477f0278f84f898145b1f141ba26ee26 (diff)
downloadlinux-6831c6edc7b272a08dd2a6c71bb183a48fe98ae6.tar.xz
PM: Drop pm_flags that is not necessary
The variable pm_flags is used to prevent APM from being enabled along with ACPI, which would lead to problems. However, acpi_init() is always called before apm_init() and after acpi_init() has returned, it is known whether or not ACPI will be used. Namely, if acpi_disabled is not set after acpi_init() has returned, this means that ACPI is enabled. Thus, it is sufficient to check acpi_disabled in apm_init() to prevent APM from being enabled in parallel with ACPI. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/pm.h')
-rw-r--r--include/linux/pm.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 9279175a4557..1f79c98f1e56 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -565,15 +565,6 @@ enum dpm_order {
DPM_ORDER_DEV_LAST,
};
-/*
- * Global Power Management flags
- * Used to keep APM and ACPI from both being active
- */
-extern unsigned int pm_flags;
-
-#define PM_APM 1
-#define PM_ACPI 2
-
extern int pm_generic_suspend(struct device *dev);
extern int pm_generic_resume(struct device *dev);
extern int pm_generic_freeze(struct device *dev);