Merge remote-tracking branch 'lorenzo/pci/xgene' into next

* lorenzo/pci/xgene:
  PCI: xgene: Remove leftover pci_scan_child_bus() call

diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 465aa2a1b38dbadf9e96493a1e5a58d1b9cb8cf6..e60c457cefdb7aa884958c33c3d6679661658bfc 100644 (file)
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -668,7 +668,6 @@ static int xgene_pcie_probe(struct platform_device *pdev)
 
        bus = bridge->bus;
 
-       pci_scan_child_bus(bus);
        pci_assign_unassigned_bus_resources(bus);
        list_for_each_entry(child, &bus->children, node)
                pcie_bus_configure_settings(child);