PCI/ACPI: Make acpi_pci_root_remove() stop/remove pci root bus

It will call pci_stop_and_remove_bus() to stop/remove pci root bus.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
CC: Len Brown <lenb@kernel.org>
CC: linux-acpi@vger.kernel.org

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 27adbfdffb0c..aed09537861a 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -667,14 +667,20 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
         struct acpi_pci_root *root = acpi_driver_data(device);
         struct acpi_pci_driver *driver;
 
+        pci_stop_root_bus(root->bus);
+
         mutex_lock(&acpi_pci_root_lock);
         list_for_each_entry(driver, &acpi_pci_drivers, node)
                 if (driver->remove)
                         driver->remove(root);
+        mutex_unlock(&acpi_pci_root_lock);
 
         device_set_run_wake(root->bus->bridge, false);
         pci_acpi_remove_bus_pm_notifier(device);
 
+        pci_remove_root_bus(root->bus);
+
+        mutex_lock(&acpi_pci_root_lock);
         list_del(&root->node);
         mutex_unlock(&acpi_pci_root_lock);
         kfree(root);