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>

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 946610f00aa115c6c29520cfec73693ce748f8b5..c13307279f7e9f2758d4a6e04599ef24665e77c3 100644 (file)
--- 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 a8178add7fd12f03ed0a541f2f8eb1567b5f5441..4a35f6e819d35010ff79172c0dd6afea31af5f28 100644 (file)
--- 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 391d0358a592ce6ab389687f321bfb8e0e4b62c3..3b88981dd21539c4f82b6558dab621be037d590e 100644 (file)
--- 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);