Merge branch 'pci/rafael-set-root-bridge-handle' into next

* pci/rafael-set-root-bridge-handle:
  ACPI / PCI: Set root bridge ACPI handle in advance

2 files changed, 16 insertions, 19 deletions

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 42736e213f25..1c2587c40299 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -302,24 +302,6 @@ static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
         return 0;
 }
 
-static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle)
-{
-        int num;
-        unsigned int seg, bus;
-
-        /*
-         * The string should be the same as root bridge's name
-         * Please look at 'pci_scan_bus_parented'
-         */
-        num = sscanf(dev_name(dev), "pci%04x:%02x", &seg, &bus);
-        if (num != 2)
-                return -ENODEV;
-        *handle = acpi_get_pci_rootbridge_handle(seg, bus);
-        if (!*handle)
-                return -ENODEV;
-        return 0;
-}
-
 static void pci_acpi_setup(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -378,7 +360,6 @@ static void pci_acpi_cleanup(struct device *dev)
 static struct acpi_bus_type acpi_pci_bus = {
         .bus = &pci_bus_type,
         .find_device = acpi_pci_find_device,
-        .find_bridge = acpi_pci_find_root_bridge,
         .setup = pci_acpi_setup,
         .cleanup = pci_acpi_cleanup,
 };
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2dcd22d9c816..bbe4be7fc685 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1632,6 +1632,18 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
         return max;
 }
 
+/**
+ * pcibios_root_bridge_prepare - Platform-specific host bridge setup.
+ * @bridge: Host bridge to set up.
+ *
+ * Default empty implementation.  Replace with an architecture-specific setup
+ * routine, if necessary.
+ */
+int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+        return 0;
+}
+
 struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
                 struct pci_ops *ops, void *sysdata, struct list_head *resources)
 {
@@ -1665,6 +1677,10 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
         bridge->dev.parent = parent;
         bridge->dev.release = pci_release_bus_bridge_dev;
         dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
+        error = pcibios_root_bridge_prepare(bridge);
+        if (error)
+                goto bridge_dev_reg_err;
+
         error = device_register(&bridge->dev);
         if (error)
                 goto bridge_dev_reg_err;