Commit 6a08164d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge irq/cleanup fragments into irq/msi 

Pick up the PCI changes to avoid conflicts.
parents 7dd20bf2 fdc34812

drivers/pci/controller/dwc/pcie-designware-host.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = { 
int dw_pcie_allocate_domains(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct fwnode_handle *fwnode = of_node_to_fwnode(pci->dev->of_node);

	struct fwnode_handle *fwnode = of_fwnode_handle(pci->dev->of_node);



	pp->irq_domain = irq_domain_create_linear(fwnode, pp->num_vectors,

					       &dw_pcie_msi_domain_ops, pp);

drivers/pci/controller/mobiveil/pcie-mobiveil-host.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = { 
static int mobiveil_allocate_msi_domains(struct mobiveil_pcie *pcie)

{

	struct device *dev = &pcie->pdev->dev;

	struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node);

	struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node);

	struct mobiveil_msi *msi = &pcie->rp.msi;



	mutex_init(&msi->lock);

drivers/pci/controller/pci-xgene-msi.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi) 
	if (!msi->inner_domain)

		return -ENOMEM;



	msi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(msi->node),

	msi->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(msi->node),

						    &xgene_msi_domain_info,

						    msi->inner_domain);

drivers/pci/controller/pcie-altera-msi.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = { 


static int altera_allocate_domains(struct altera_msi *msi)

{

	struct fwnode_handle *fwnode = of_node_to_fwnode(msi->pdev->dev.of_node);

	struct fwnode_handle *fwnode = of_fwnode_handle(msi->pdev->dev.of_node);



	msi->inner_domain = irq_domain_add_linear(NULL, msi->num_of_vectors,

					     &msi_domain_ops, msi);

drivers/pci/controller/pcie-brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static const struct irq_domain_ops msi_domain_ops = { 


static int brcm_allocate_domains(struct brcm_msi *msi)

{

	struct fwnode_handle *fwnode = of_node_to_fwnode(msi->np);

	struct fwnode_handle *fwnode = of_fwnode_handle(msi->np);

	struct device *dev = msi->dev;



	msi->inner_domain = irq_domain_add_linear(NULL, msi->nr, &msi_domain_ops, msi);