[PATCH v9 24/30] PCI/tegra: Remove redundant tegra_pcie_scan_bus()
flat view
STALE4212d
SUPERSEDED: 2 (0M)
From: Yijing Wang <hidden>
Date: 2015-04-03 09:30:54
Also in:
linux-alpha, linux-m68k, linux-pci, linux-tegra, lkml
Subsystem:
pci subsystem, the rest · Maintainers:
Bjorn Helgaas, Linus Torvalds
Revision v9 of 17 in this series; 2 review trailers.
Revisions (17)
- v1 [diff vs current]
- v1 [diff vs current]
- v2 [diff vs current]
- v2 [diff vs current]
- v3 [diff vs current]
- v3 [diff vs current]
- v4 [diff vs current]
- v4 [diff vs current]
- v5 [diff vs current]
- v5 [diff vs current]
- v6 [diff vs current]
- v6 [diff vs current]
- v7 [diff vs current]
- v7 [diff vs current]
- v8 [diff vs current]
- v9 current
- v10 [diff vs current]
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. Tested-by: Thierry Reding <redacted> Signed-off-by: Yijing Wang <redacted> Acked-by: Thierry Reding <redacted> CC: Thierry Reding <redacted> CC: linux-tegra at vger.kernel.org --- drivers/pci/host/pci-tegra.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
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);
--
1.7.1