Commit 4f317eac authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/mobiveil' 

- Simplify mobiveil_pcie_init_irq_domain() (Liu Shixin)

* remotes/lorenzo/pci/mobiveil:
  PCI: mobiveil: Simplify mobiveil_pcie_init_irq_domain() return expression
parents 92f27db7 df7fc055

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

+1 −6
Original line number Diff line number Diff line
@@ -480,7 +480,6 @@ static int mobiveil_pcie_init_irq_domain(struct mobiveil_pcie *pcie) 
	struct device *dev = &pcie->pdev->dev;

	struct device_node *node = dev->of_node;

	struct mobiveil_root_port *rp = &pcie->rp;

	int ret;



	/* setup INTx */

	rp->intx_domain = irq_domain_add_linear(node, PCI_NUM_INTX,
@@ -494,11 +493,7 @@ static int mobiveil_pcie_init_irq_domain(struct mobiveil_pcie *pcie) 
	raw_spin_lock_init(&rp->intx_mask_lock);



	/* setup MSI */

	ret = mobiveil_allocate_msi_domains(pcie);

	if (ret)

		return ret;



	return 0;

	return mobiveil_allocate_msi_domains(pcie);

}



static int mobiveil_pcie_integrated_interrupt_init(struct mobiveil_pcie *pcie)