Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: designware: Use pci_scan_root_bus() for simplicity

After b97ea289cf6a ("PCI: Assign resources before drivers claim devices
(pci_scan_root_bus())"), pci_scan_root_bus() no longer adds the devices, so
it is equivalent to:

pci_create_root_bus()
pci_scan_child_bus()

Use pci_scan_root_bus() to simplify the code.

[bhelgaas: changelog]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Jingoo Han <jingoohan1@gmail.com>
CC: Mohit Kumar <mohit.kumar@st.com>

authored by

Yijing Wang and committed by
Bjorn Helgaas
528d4bce 915ad861

+1 -3
+1 -3
drivers/pci/host/pcie-designware.c
··· 728 728 struct pcie_port *pp = sys_to_pcie(sys); 729 729 730 730 pp->root_bus_nr = sys->busnr; 731 - bus = pci_create_root_bus(pp->dev, sys->busnr, 731 + bus = pci_scan_root_bus(pp->dev, sys->busnr, 732 732 &dw_pcie_ops, sys, &sys->resources); 733 733 if (!bus) 734 734 return NULL; 735 - 736 - pci_scan_child_bus(bus); 737 735 738 736 if (bus && pp->ops->scan_bus) 739 737 pp->ops->scan_bus(pp);