summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2017-11-21 15:49:31 +0000
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2017-12-19 11:18:54 +0000
commit94b9d290b753cbbc87971ee134511245f5872a83 (patch)
tree57633fc6eb404f524c22e0920109ae1d56c22f13 /drivers/pci
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff)
downloadblackbird-obmc-linux-94b9d290b753cbbc87971ee134511245f5872a83.tar.gz
blackbird-obmc-linux-94b9d290b753cbbc87971ee134511245f5872a83.zip
PCI: xgene: Remove leftover pci_scan_child_bus() call
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-xgene.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 465aa2a1b38d..e60c457cefdb 100644
--- 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);
OpenPOWER on IntegriCloud