[PATCH 73/98] ACPI: call acpi_system_init() explicitly rather than as initcall

Len Brown
2009-03-28T04:33:35Z

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

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>
---
drivers/acpi/bus.c | 1 +
drivers/acpi/internal.h | 1 +
drivers/acpi/system.c | 9 ++-------
3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 946610f..c133072 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -882,6 +882,7 @@ static int __init acpi_init(void)
acpi_scan_init();
acpi_ec_init();
acpi_power_init();
+ acpi_system_init();
return result;
}

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a8178ad..4a35f6e 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -1,6 +1,7 @@
/* For use by Linux/ACPI infrastructure, not drivers */

int acpi_scan_init(void);
+int acpi_system_init(void);

/* --------------------------------------------------------------------------
Power Resource
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 391d035..3b88981 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);
--
1.6.0.6