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

* lorenzo/pci/xgene: PCI: xgene: Remove leftover pci_scan_child_bus() call
mariux64 · Feb 1, 2018 · a5fae84 · a5fae84
2 parents 163b716 + 94b9d29
commit a5fae84
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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);