| commit | 6831c6edc7b272a08dd2a6c71bb183a48fe98ae6 | |
| author | Rafael J. Wysocki <rjw@sisk.pl> | |
| Tue, 15 Feb 2011 20:22:24 +0000 (15 21:22 +0100) | ||
| committer | Rafael J. Wysocki <rjw@sisk.pl> | |
| Mon, 14 Mar 2011 23:43:16 +0000 (15 00:43 +0100) | ||
| tree | fc3ef253f12bd9f2d211271c09a5475ed19b18b0 | treesnapshot (tar.gz zip) |
| parent | e8665002477f0278f84f898145b1f141ba26ee26 | commitdiff |
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>
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>