mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 01:51:34 +00:00
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>
This commit is contained in:
parent
44515374cb
commit
141a0af3ca
@ -882,6 +882,7 @@ static int __init acpi_init(void)
|
||||
acpi_scan_init();
|
||||
acpi_ec_init();
|
||||
acpi_power_init();
|
||||
acpi_system_init();
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
/* For use by Linux/ACPI infrastructure, not drivers */
|
||||
|
||||
int acpi_scan_init(void);
|
||||
int acpi_system_init(void);
|
||||
|
||||
/* --------------------------------------------------------------------------
|
||||
Power Resource
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user