summaryrefslogtreecommitdiff
path: root/drivers/acpi/system.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 16:49:58 -0600
committerLen Brown <len.brown@intel.com>2009-03-27 12:50:19 -0400
commit141a0af3cab7de690816b17aad1682050219f774 (patch)
tree1b2026b63b879e65a5b347115554064d4df633bb /drivers/acpi/system.c
parent44515374cba9e46d5622256b43eb06b9c349cee1 (diff)
ACPI: call acpi_system_init() explicitly rather than as initcall
This patch makes acpi_init() call acpi_system_init() directly. Previously, both were subsys_initcalls. acpi_system_init() must happen after acpi_init(), and it's better to call it explicitly rather than rely on link ordering. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/system.c')
-rw-r--r--drivers/acpi/system.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 391d0358a59..3b88981dd21 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void)
}
#endif
-static int __init acpi_system_init(void)
+int __init acpi_system_init(void)
{
- int result = 0;
-
- if (acpi_disabled)
- return 0;
+ int result;
result = acpi_system_procfs_init();
if (result)
@@ -586,5 +583,3 @@ static int __init acpi_system_init(void)
return result;
}
-
-subsys_initcall(acpi_system_init);