PCI: xgene: Remove leftover pci_scan_child_bus() call
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 21 Nov 2017 15:49:31 +0000 (15:49 +0000)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 19 Dec 2017 11:18:54 +0000 (11:18 +0000)
The changes in commit 9af275be15f7 ("PCI: xgene: Convert PCI scan API to
pci_scan_root_bus_bridge()") converted the xgene PCI host driver to
the new pci_scan_root_bus_bridge() bus scanning API but erroneously left
the existing pci_scan_child_bus() call in place which resulted in duplicate
PCI bus enumerations.

Remove the leftover pci_scan_child_bus() call to properly complete the API
conversion.

Fixes: 9af275be15f7 ("PCI: xgene: Convert PCI scan API to pci_scan_root_bus_bridge()")
Tested-by: Khuong Dinh <kdinh@apm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <stable@vger.kernel.org> # 4.13+
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tanmay Inamdar <tinamdar@apm.com>
drivers/pci/host/pci-xgene.c

index 465aa2a1b38dbadf9e96493a1e5a58d1b9cb8cf6..e60c457cefdb7aa884958c33c3d6679661658bfc 100644 (file)
@@ -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);