diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-11-06 08:20:42 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-11-06 20:32:31 -0500 |
commit | 4505a2015f4c4b2f21137cc3a6b7400b0f3e073e (patch) | |
tree | 85c5b4da507a1b7a98ad7ede5e1abf1ad07abb46 /drivers/acpi | |
parent | 581de59e8dff8eaa52809e768a585e9ef336aa4a (diff) |
ACPI: Drop ACPI_NO_HARDWARE_INIT
ACPI_NO_HARDWARE_INIT is only used by acpi_early_init() and
acpi_bus_init() when calling acpi_enable_subsystem(), but
acpi_enable_subsystem() doesn't check that flag, so it can be
dropped.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/bus.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 437ddbf0c49a..9ecec98bc76e 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -911,10 +911,7 @@ void __init acpi_early_init(void) | |||
911 | } | 911 | } |
912 | #endif | 912 | #endif |
913 | 913 | ||
914 | status = | 914 | status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE); |
915 | acpi_enable_subsystem(~ | ||
916 | (ACPI_NO_HARDWARE_INIT | | ||
917 | ACPI_NO_ACPI_ENABLE)); | ||
918 | if (ACPI_FAILURE(status)) { | 915 | if (ACPI_FAILURE(status)) { |
919 | printk(KERN_ERR PREFIX "Unable to enable ACPI\n"); | 916 | printk(KERN_ERR PREFIX "Unable to enable ACPI\n"); |
920 | goto error0; | 917 | goto error0; |
@@ -935,8 +932,7 @@ static int __init acpi_bus_init(void) | |||
935 | 932 | ||
936 | acpi_os_initialize1(); | 933 | acpi_os_initialize1(); |
937 | 934 | ||
938 | status = | 935 | status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE); |
939 | acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE); | ||
940 | if (ACPI_FAILURE(status)) { | 936 | if (ACPI_FAILURE(status)) { |
941 | printk(KERN_ERR PREFIX | 937 | printk(KERN_ERR PREFIX |
942 | "Unable to start the ACPI Interpreter\n"); | 938 | "Unable to start the ACPI Interpreter\n"); |