Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: tegra: Remove tegra_pcie_scan_bus()

After b97ea289cf6a ("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 <treding@nvidia.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thierry Reding <treding@nvidia.com>

authored by

Yijing Wang and committed by
Bjorn Helgaas
915ad861 2dead00b

-16
-16
drivers/pci/host/pci-tegra.c
··· 630 630 return irq; 631 631 } 632 632 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 - 648 633 static irqreturn_t tegra_pcie_isr(int irq, void *arg) 649 634 { 650 635 const char *err_msg[] = { ··· 1816 1831 hw.private_data = (void **)&pcie; 1817 1832 hw.setup = tegra_pcie_setup; 1818 1833 hw.map_irq = tegra_pcie_map_irq; 1819 - hw.scan = tegra_pcie_scan_bus; 1820 1834 hw.ops = &tegra_pcie_ops; 1821 1835 1822 1836 pci_common_init_dev(pcie->dev, &hw);