| Message ID | 1430204499-19571-4-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Dienstag, den 28.04.2015, 15:01 +0800 schrieb Yijing Wang: > Pci_bus_add_devices() was ripped out of pci_scan_root_bus(). > Now pci_scan_root_bus() == pci_create_root_bus() + > pci_scan_child_bus() if busn resource is supplied. > Designware added the busn resource to resources list > in dw_pcie_setup(). So it should be safe to use > pci_scan_root_bus() instead. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > CC: Mohit Kumar <mohit.kumar@st.com> > CC: Jingoo Han <jg1.han@samsung.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/pci/host/pcie-designware.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 2e9f84f..8c80f38 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -728,13 +728,11 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys) > struct pcie_port *pp = sys_to_pcie(sys); > > pp->root_bus_nr = sys->busnr; > - bus = pci_create_root_bus(pp->dev, sys->busnr, > + bus = pci_scan_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); >
[+cc Pratyush] On Tue, Apr 28, 2015 at 03:01:37PM +0800, Yijing Wang wrote: > Pci_bus_add_devices() was ripped out of pci_scan_root_bus(). > Now pci_scan_root_bus() == pci_create_root_bus() + > pci_scan_child_bus() if busn resource is supplied. > Designware added the busn resource to resources list > in dw_pcie_setup(). So it should be safe to use > pci_scan_root_bus() instead. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > CC: Mohit Kumar <mohit.kumar@st.com> > CC: Jingoo Han <jg1.han@samsung.com> Jingoo, Pratyush? > --- > drivers/pci/host/pcie-designware.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 2e9f84f..8c80f38 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -728,13 +728,11 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys) > struct pcie_port *pp = sys_to_pcie(sys); > > pp->root_bus_nr = sys->busnr; > - bus = pci_create_root_bus(pp->dev, sys->busnr, > + bus = pci_scan_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); > > -- > 1.7.1 >
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 2e9f84f..8c80f38 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -728,13 +728,11 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys) struct pcie_port *pp = sys_to_pcie(sys); pp->root_bus_nr = sys->busnr; - bus = pci_create_root_bus(pp->dev, sys->busnr, + bus = pci_scan_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);
Pci_bus_add_devices() was ripped out of pci_scan_root_bus(). Now pci_scan_root_bus() == pci_create_root_bus() + pci_scan_child_bus() if busn resource is supplied. Designware added the busn resource to resources list in dw_pcie_setup(). So it should be safe to use pci_scan_root_bus() instead. Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Mohit Kumar <mohit.kumar@st.com> CC: Jingoo Han <jg1.han@samsung.com> --- drivers/pci/host/pcie-designware.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)