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

Commit 2dc5b399 authored by Yijing Wang's avatar Yijing Wang Committed by Alex Shi
Browse files

PCI: rcar: 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 rcar_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 7840cba885a4570314feac1d68b5e128e1bdc94c)

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

drivers/pci/host/pcie-rcar.c

+3 −10
Original line number Diff line number Diff line
@@ -380,20 +380,10 @@ static int rcar_pcie_setup(int nr, struct pci_sys_data *sys) 
	return 1;

}



static void rcar_pcie_add_bus(struct pci_bus *bus)

{

	if (IS_ENABLED(CONFIG_PCI_MSI)) {

		struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);



		bus->msi = &pcie->msi.chip;

	}

}



struct hw_pci rcar_pci = {

	.setup          = rcar_pcie_setup,

	.map_irq        = of_irq_parse_and_map_pci,

	.ops            = &rcar_pcie_ops,

	.add_bus        = rcar_pcie_add_bus,

};



static void rcar_pcie_enable(struct rcar_pcie *pcie)
@@ -402,6 +392,9 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie) 


	rcar_pci.nr_controllers = 1;

	rcar_pci.private_data = (void **)&pcie;

#ifdef CONFIG_PCI_MSI

	rcar_pci.msi_ctrl = &pcie->msi.chip;

#endif



	pci_common_init_dev(&pdev->dev, &rcar_pci);

#ifdef CONFIG_PCI_DOMAINS