aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 18:50:19 -0400
committerLen Brown <len.brown@intel.com>2009-03-27 12:51:31 -0400
commit201b8c655f7a48563f6a0b66f9e388460a1ea611 (patch)
tree262341b6fd76e17ddce25c9ea87f081104aca6a8 /drivers/acpi/bus.c
parent9cee43e07940bee13462e63bd75ce4430b155886 (diff)
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>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index a812e841cb64..7fe0945f7bcf 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -886,6 +886,7 @@ static int __init acpi_init(void)
886 acpi_system_init(); 886 acpi_system_init();
887 acpi_debug_init(); 887 acpi_debug_init();
888 acpi_sleep_proc_init(); 888 acpi_sleep_proc_init();
889 acpi_wakeup_device_init();
889 return result; 890 return result;
890} 891}
891 892