diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2014-11-11 23:35:05 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-11-21 17:33:45 +0100 |
| commit | 7ec725b2d5757754bd8bc5fd13d5f8c53d44ce80 (patch) | |
| tree | 94c726fc99b1f437cd975bc622d90d7f07495bc6 /drivers/pci/host/pci-tegra.c | |
| parent | ARM/PCI: Save MSI controller in pci_sys_data (diff) | |
| download | linux-7ec725b2d5757754bd8bc5fd13d5f8c53d44ce80.tar.xz linux-7ec725b2d5757754bd8bc5fd13d5f8c53d44ce80.zip | |
PCI: tegra: Save MSI controller in pci_sys_data
Save MSI controller in pci_sys_data instead of assigning MSI controller
pointer to every PCI bus in .add_bus().
[bhelgaas: use struct tegra_msi.chip, not ctrl]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/host/pci-tegra.c')
| -rw-r--r-- | drivers/pci/host/pci-tegra.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 5529de7328ba..1f01faa918cc 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -694,15 +694,6 @@ static int tegra_pcie_map_irq(const struct pci_dev *pdev, u8 slot, u8 pin) return irq; } -static void tegra_pcie_add_bus(struct pci_bus *bus) -{ - if (IS_ENABLED(CONFIG_PCI_MSI)) { - struct tegra_pcie *pcie = sys_to_pcie(bus->sysdata); - - bus->msi = &pcie->msi.chip; - } -} - static struct pci_bus *tegra_pcie_scan_bus(int nr, struct pci_sys_data *sys) { struct tegra_pcie *pcie = sys_to_pcie(sys); @@ -1882,11 +1873,14 @@ static int tegra_pcie_enable(struct tegra_pcie *pcie) memset(&hw, 0, sizeof(hw)); +#ifdef CONFIG_PCI_MSI + hw.msi_ctrl = &pcie->msi.chip; +#endif + hw.nr_controllers = 1; hw.private_data = (void **)&pcie; hw.setup = tegra_pcie_setup; hw.map_irq = tegra_pcie_map_irq; - hw.add_bus = tegra_pcie_add_bus; hw.scan = tegra_pcie_scan_bus; hw.ops = &tegra_pcie_ops; |