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

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

Merge remote-tracking branch 'lorenzo/pci/xgene' into next
* lorenzo/pci/xgene: PCI: xgene: Remove leftover pci_scan_child_bus() call
a5fae846 · Bjorn Helgaas · Bjorn Helgaas · 163b716d · 94b9d290 · a5fae846
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

drivers/pci/host/pci-xgene.c drivers/pci/host/pci-xgene.c +0 -1

未找到文件。
--- 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);