Skip to content

Commit 915ad86

Browse files
YijingWangbjorn-helgaas
authored andcommitted
PCI: tegra: Remove tegra_pcie_scan_bus()
After b97ea28 ("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 tegra_pcie_scan_bus(). Remove tegra_pcie_scan_bus() (the hw.scan method), so we use the generic pci_scan_root_bus() path. [bhelgaas: changelog] Tested-by: Thierry Reding <[email protected]> Signed-off-by: Yijing Wang <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Thierry Reding <[email protected]>
1 parent 2dead00 commit 915ad86

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

drivers/pci/host/pci-tegra.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -630,21 +630,6 @@ static int tegra_pcie_map_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
630630
return irq;
631631
}
632632

633-
static struct pci_bus *tegra_pcie_scan_bus(int nr, struct pci_sys_data *sys)
634-
{
635-
struct tegra_pcie *pcie = sys_to_pcie(sys);
636-
struct pci_bus *bus;
637-
638-
bus = pci_create_root_bus(pcie->dev, sys->busnr, &tegra_pcie_ops, sys,
639-
&sys->resources);
640-
if (!bus)
641-
return NULL;
642-
643-
pci_scan_child_bus(bus);
644-
645-
return bus;
646-
}
647-
648633
static irqreturn_t tegra_pcie_isr(int irq, void *arg)
649634
{
650635
const char *err_msg[] = {
@@ -1831,7 +1816,6 @@ static int tegra_pcie_enable(struct tegra_pcie *pcie)
18311816
hw.private_data = (void **)&pcie;
18321817
hw.setup = tegra_pcie_setup;
18331818
hw.map_irq = tegra_pcie_map_irq;
1834-
hw.scan = tegra_pcie_scan_bus;
18351819
hw.ops = &tegra_pcie_ops;
18361820

18371821
pci_common_init_dev(pcie->dev, &hw);

0 commit comments

Comments
 (0)