|
@@ -814,14 +814,13 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
|
|
|
struct pci_bus *bus;
|
|
|
struct pcie_port *pp = sys_to_pcie(sys);
|
|
|
|
|
|
- if (pp) {
|
|
|
- pp->root_bus_nr = sys->busnr;
|
|
|
- bus = pci_scan_root_bus(pp->dev, sys->busnr, &dw_pcie_ops,
|
|
|
- sys, &sys->resources);
|
|
|
- } else {
|
|
|
- bus = NULL;
|
|
|
- BUG();
|
|
|
- }
|
|
|
+ pp->root_bus_nr = sys->busnr;
|
|
|
+ bus = pci_create_root_bus(pp->dev, sys->busnr,
|
|
|
+ &dw_pcie_ops, sys, &sys->resources);
|
|
|
+ if (!bus)
|
|
|
+ return NULL;
|
|
|
+
|
|
|
+ pci_scan_child_bus(bus);
|
|
|
|
|
|
if (bus && pp->ops->scan_bus)
|
|
|
pp->ops->scan_bus(pp);
|