ACPI: call acpi_wakeup_device_init() explicitly rather than as initcall
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Tue, 24 Mar 2009 22:50:19 +0000 (16:50 -0600)
committerLen Brown <len.brown@intel.com>
Fri, 27 Mar 2009 16:51:31 +0000 (12:51 -0400)
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>
drivers/acpi/bus.c
drivers/acpi/internal.h
drivers/acpi/wakeup.c

Simple merge
Simple merge
Simple merge