| Message ID | 1427168064-8657-25-git-send-email-wangyijing@huawei.com |
|---|---|
| State | Deferred |
| Headers | show |
On Tue, Mar 24, 2015 at 11:34:18AM +0800, Yijing Wang wrote: > Now pci_scan_root_bus() is almost similar to > pci_create_root_bus() + pci_scan_child_bus(). > So we could use common pci_scan_root_bus() in > pci_common_init_dev() to scan pci busses. > tegra_pcie_scan_bus() is redundant, remove it. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > CC: Thierry Reding <thierry.reding@gmail.com> > CC: linux-tegra@vger.kernel.org > --- > drivers/pci/host/pci-tegra.c | 16 ---------------- > 1 files changed, 0 insertions(+), 16 deletions(-) Jetson TK1 still boots over NFS root via the onboard PCIe network card with this series applied, so: Tested-by: Thierry Reding <treding@nvidia.com> Acked-by: Thierry Reding <treding@nvidia.com>
On 2015/3/24 20:31, Thierry Reding wrote: > On Tue, Mar 24, 2015 at 11:34:18AM +0800, Yijing Wang wrote: >> Now pci_scan_root_bus() is almost similar to >> pci_create_root_bus() + pci_scan_child_bus(). >> So we could use common pci_scan_root_bus() in >> pci_common_init_dev() to scan pci busses. >> tegra_pcie_scan_bus() is redundant, remove it. >> >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> >> CC: Thierry Reding <thierry.reding@gmail.com> >> CC: linux-tegra@vger.kernel.org >> --- >> drivers/pci/host/pci-tegra.c | 16 ---------------- >> 1 files changed, 0 insertions(+), 16 deletions(-) > > Jetson TK1 still boots over NFS root via the onboard PCIe network card > with this series applied, so: > > Tested-by: Thierry Reding <treding@nvidia.com> > Acked-by: Thierry Reding <treding@nvidia.com> Thanks! >
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 94e9362..10c0571 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -630,21 +630,6 @@ static int tegra_pcie_map_irq(const struct pci_dev *pdev, u8 slot, u8 pin) return irq; } -static struct pci_bus *tegra_pcie_scan_bus(int nr, struct pci_sys_data *sys) -{ - struct tegra_pcie *pcie = sys_to_pcie(sys); - struct pci_bus *bus; - - bus = pci_create_root_bus(pcie->dev, -1, sys->busnr, &tegra_pcie_ops, - sys, &sys->resources); - if (!bus) - return NULL; - - pci_scan_child_bus(bus); - - return bus; -} - static irqreturn_t tegra_pcie_isr(int irq, void *arg) { const char *err_msg[] = { @@ -1831,7 +1816,6 @@ static int tegra_pcie_enable(struct tegra_pcie *pcie) hw.private_data = (void **)&pcie; hw.setup = tegra_pcie_setup; hw.map_irq = tegra_pcie_map_irq; - hw.scan = tegra_pcie_scan_bus; hw.ops = &tegra_pcie_ops; pci_common_init_dev(pcie->dev, &hw);
Now pci_scan_root_bus() is almost similar to pci_create_root_bus() + pci_scan_child_bus(). So we could use common pci_scan_root_bus() in pci_common_init_dev() to scan pci busses. tegra_pcie_scan_bus() is redundant, remove it. Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Thierry Reding <thierry.reding@gmail.com> CC: linux-tegra@vger.kernel.org --- drivers/pci/host/pci-tegra.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)