Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64b9adaf authored by Yijing Wang's avatar Yijing Wang Committed by Alex Shi
Browse files

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: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
(cherry picked from commit 7ec725b2d5757754bd8bc5fd13d5f8c53d44ce80)

Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent e7486e21

drivers/pci/host/pci-tegra.c

+4 −10
Original line number Diff line number Diff line
@@ -692,15 +692,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);
@@ -1894,11 +1885,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;