1 files changed, 12 insertions, 55 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index dcbe9660e756..471b2dcb1c67 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -47,7 +47,6 @@ ACPI_MODULE_NAME("pci_root");
 #define ACPI_PCI_ROOT_DEVICE_NAME       "PCI Root Bridge"
 static int acpi_pci_root_add(struct acpi_device *device);
 static int acpi_pci_root_remove(struct acpi_device *device, int type);
-static int acpi_pci_root_start(struct acpi_device *device);
 
 #define ACPI_PCIE_REQ_SUPPORT (OSC_EXT_PCI_CONFIG_SUPPORT \
                                 | OSC_ACTIVE_STATE_PWR_SUPPORT \
@@ -67,7 +66,6 @@ static struct acpi_driver acpi_pci_root_driver = {
         .ops = {
                 .add = acpi_pci_root_add,
                 .remove = acpi_pci_root_remove,
-                .start = acpi_pci_root_start,
                 },
 };
 
@@ -188,21 +186,6 @@ static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
         return AE_OK;
 }
 
-static void acpi_pci_bridge_scan(struct acpi_device *device)
-{
-        int status;
-        struct acpi_device *child = NULL;
-
-        if (device->flags.bus_address)
-                if (device->parent && device->parent->ops.bind) {
-                        status = device->parent->ops.bind(device);
-                        if (!status) {
-                                list_for_each_entry(child, &device->children, node)
-                                        acpi_pci_bridge_scan(child);
-                        }
-                }
-}
-
 static u8 pci_osc_uuid_str[] = "33DB4D5B-1FF7-401C-9657-7441C03DD766";
 
 static acpi_status acpi_pci_run_osc(acpi_handle handle,
@@ -452,7 +435,7 @@ static int acpi_pci_root_add(struct acpi_device *device)
         int result;
         struct acpi_pci_root *root;
         acpi_handle handle;
-        struct acpi_device *child;
+        struct acpi_pci_driver *driver;
         u32 flags, base_flags;
         bool is_osc_granted = false;
 
@@ -603,21 +586,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
                 goto out_del_root;
         }
 
-        /*
-         * Attach ACPI-PCI Context
-         * -----------------------
-         * Thus binding the ACPI and PCI devices.
-         */
-        result = acpi_pci_bind_root(device);
-        if (result)
-                goto out_del_root;
-
-        /*
-         * Scan and bind all _ADR-Based Devices
-         */
-        list_for_each_entry(child, &device->children, node)
-                acpi_pci_bridge_scan(child);
-
         /* ASPM setting */
         if (is_osc_granted) {
                 if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM)
@@ -632,24 +600,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
         if (device->wakeup.flags.run_wake)
                 device_set_run_wake(root->bus->bridge, true);
 
-        return 0;
-
-out_del_root:
-        mutex_lock(&acpi_pci_root_lock);
-        list_del(&root->node);
-        mutex_unlock(&acpi_pci_root_lock);
-
-        acpi_pci_irq_del_prt(root->segment, root->secondary.start);
-end:
-        kfree(root);
-        return result;
-}
-
-static int acpi_pci_root_start(struct acpi_device *device)
-{
-        struct acpi_pci_root *root = acpi_driver_data(device);
-        struct acpi_pci_driver *driver;
-
         if (system_state != SYSTEM_BOOTING) {
                 pcibios_resource_survey_bus(root->bus);
                 pci_assign_unassigned_bus_resources(root->bus);
@@ -666,8 +616,17 @@ static int acpi_pci_root_start(struct acpi_device *device)
                 pci_enable_bridges(root->bus);
 
         pci_bus_add_devices(root->bus);
-
         return 0;
+
+out_del_root:
+        mutex_lock(&acpi_pci_root_lock);
+        list_del(&root->node);
+        mutex_unlock(&acpi_pci_root_lock);
+
+        acpi_pci_irq_del_prt(root->segment, root->secondary.start);
+end:
+        kfree(root);
+        return result;
 }
 
 static int acpi_pci_root_remove(struct acpi_device *device, int type)
@@ -701,7 +660,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-static int __init acpi_pci_root_init(void)
+int __init acpi_pci_root_init(void)
 {
         acpi_hest_init();
 
@@ -714,5 +673,3 @@ static int __init acpi_pci_root_init(void)
 
         return 0;
 }
-
-subsys_initcall(acpi_pci_root_init);