ACPI: call acpi_wakeup_device_init() explicitly rather than as initcall

This patch makes acpi_init() call acpi_wakeup_device_init() directly.
Previously, acpi_wakeup_device_init() was a late_initcall (sequence 7).

acpi_wakeup_device_init() depends on acpi_wakeup_device_list, which
is populated when ACPI devices are enumerated by acpi_init() ->
acpi_scan_init().  Using late_initcall is certainly enough to make
sure acpi_wakeup_device_list is populated, but it is more than
necessary.  We can just as easily call acpi_wakeup_device_init()
directly from acpi_init(), which avoids the initcall magic.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
CC: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index a812e841cb64b5ba59c792719c6d9685fd06c8ef..7fe0945f7bcff7a3e2001ae5a1e44a8bdb6b1366 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -886,6 +886,7 @@ static int __init acpi_init(void)
        acpi_system_init();
        acpi_debug_init();
        acpi_sleep_proc_init();
+       acpi_wakeup_device_init();
        return result;
 }
 

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 8870e5fd84942dc5d0f59d8c80d192554ebbff67..11a69b53004e0caed4a8228f60fd2a164da18cb5 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -22,6 +22,8 @@ int acpi_power_get_inferred_state(struct acpi_device *device);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;
 
+int acpi_wakeup_device_init(void);
+
 /* --------------------------------------------------------------------------
                                   Embedded Controller
    -------------------------------------------------------------------------- */

diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 3f29fd53e9a60223f8599d4102ef1fe5422dc89d..5aee8c26cc9fb93996569ca464987f4451876092 100644 (file)
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -138,13 +138,10 @@ void acpi_disable_wakeup_device(u8 sleep_state)
        spin_unlock(&acpi_device_lock);
 }
 
-static int __init acpi_wakeup_device_init(void)
+int __init acpi_wakeup_device_init(void)
 {
        struct list_head *node, *next;
 
-       if (acpi_disabled)
-               return 0;
-
        spin_lock(&acpi_device_lock);
        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                struct acpi_device *dev = container_of(node,
@@ -165,5 +162,3 @@ static int __init acpi_wakeup_device_init(void)
        spin_unlock(&acpi_device_lock);
        return 0;
 }
-
-late_initcall(acpi_wakeup_device_init);