瀏覽代碼

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>
Rafael J. Wysocki 13 年之前
父節點
當前提交
4505a2015f
共有 2 個文件被更改,包括 2 次插入7 次删除
  1. 2 6
      drivers/acpi/bus.c
  2. 0 1
      include/acpi/actypes.h

+ 2 - 6
drivers/acpi/bus.c

@@ -911,10 +911,7 @@ void __init acpi_early_init(void)
 	}
 	}
 #endif
 #endif
 
 
-	status =
-	    acpi_enable_subsystem(~
-				  (ACPI_NO_HARDWARE_INIT |
-				   ACPI_NO_ACPI_ENABLE));
+	status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE);
 	if (ACPI_FAILURE(status)) {
 	if (ACPI_FAILURE(status)) {
 		printk(KERN_ERR PREFIX "Unable to enable ACPI\n");
 		printk(KERN_ERR PREFIX "Unable to enable ACPI\n");
 		goto error0;
 		goto error0;
@@ -935,8 +932,7 @@ static int __init acpi_bus_init(void)
 
 
 	acpi_os_initialize1();
 	acpi_os_initialize1();
 
 
-	status =
-	    acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);
+	status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);
 	if (ACPI_FAILURE(status)) {
 	if (ACPI_FAILURE(status)) {
 		printk(KERN_ERR PREFIX
 		printk(KERN_ERR PREFIX
 		       "Unable to start the ACPI Interpreter\n");
 		       "Unable to start the ACPI Interpreter\n");

+ 0 - 1
include/acpi/actypes.h

@@ -470,7 +470,6 @@ typedef u64 acpi_integer;
  */
  */
 #define ACPI_FULL_INITIALIZATION        0x00
 #define ACPI_FULL_INITIALIZATION        0x00
 #define ACPI_NO_ADDRESS_SPACE_INIT      0x01
 #define ACPI_NO_ADDRESS_SPACE_INIT      0x01
-#define ACPI_NO_HARDWARE_INIT           0x02
 #define ACPI_NO_EVENT_INIT              0x04
 #define ACPI_NO_EVENT_INIT              0x04
 #define ACPI_NO_HANDLER_INIT            0x08
 #define ACPI_NO_HANDLER_INIT            0x08
 #define ACPI_NO_ACPI_ENABLE             0x10
 #define ACPI_NO_ACPI_ENABLE             0x10