Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b5b5e8 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Greg Kroah-Hartman
Browse files

PCI: xgene: Remove leftover pci_scan_child_bus() call 



commit 94b9d290b753cbbc87971ee134511245f5872a83 upstream.

The changes in commit 9af275be ("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: 9af275be ("PCI: xgene: Convert PCI scan API to pci_scan_root_bus_bridge()")
Tested-by: default avatarKhuong Dinh <kdinh@apm.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <stable@vger.kernel.org> # 4.13+
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tanmay Inamdar <tinamdar@apm.com>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 011626d6

drivers/pci/host/pci-xgene.c

+0 −1
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ static int xgene_pcie_probe_bridge(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);