ACPI / bus: Move ACPI bus type registration

Move the registration of the ACPI bus type to acpi_bus_init() and
avoid using ACPI going forward if it fails (too many things depend on
the presence of the ACPI bus type).

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 3 insertions, 7 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 2f50fc4be1d4..7a3ad929f095 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1039,7 +1039,9 @@ static int __init acpi_bus_init(void)
          */
         acpi_root_dir = proc_mkdir(ACPI_BUS_FILE_ROOT, NULL);
 
-        return 0;
+        result = bus_register(&acpi_bus_type);
+        if (!result)
+                return 0;
 
         /* Mimic structured exception handling */
       error1:
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f541f689ae80..2fe5a37c385c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1891,12 +1891,6 @@ int __init acpi_scan_init(void)
 {
         int result;
 
-        result = bus_register(&acpi_bus_type);
-        if (result) {
-                /* We don't want to quit even if we failed to add suspend/resume */
-                printk(KERN_ERR PREFIX "Could not register bus type\n");
-        }
-
         acpi_pci_root_init();
         acpi_pci_link_init();
         acpi_processor_init();