Commit 141a0af3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 44515374
...@@ -882,6 +882,7 @@ static int __init acpi_init(void) ...@@ -882,6 +882,7 @@ static int __init acpi_init(void)
acpi_scan_init(); acpi_scan_init();
acpi_ec_init(); acpi_ec_init();
acpi_power_init(); acpi_power_init();
acpi_system_init();
return result; return result;
} }
......
/* For use by Linux/ACPI infrastructure, not drivers */ /* For use by Linux/ACPI infrastructure, not drivers */
int acpi_scan_init(void); int acpi_scan_init(void);
int acpi_system_init(void);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Power Resource Power Resource
......
...@@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void) ...@@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void)
} }
#endif #endif
static int __init acpi_system_init(void) int __init acpi_system_init(void)
{ {
int result = 0; int result;
if (acpi_disabled)
return 0;
result = acpi_system_procfs_init(); result = acpi_system_procfs_init();
if (result) if (result)
...@@ -586,5 +583,3 @@ static int __init acpi_system_init(void) ...@@ -586,5 +583,3 @@ static int __init acpi_system_init(void)
return result; return result;
} }
subsys_initcall(acpi_system_init);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment