diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:42 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:42 -0500 |
| commit | 4f317eac2f65d62f7f250fcefc1b0804e6b288da (patch) | |
| tree | b59e52cbb293eeaee14be2e95d81b2c3776aa593 /drivers | |
| parent | 92f27db7b1bdc9611425e74fbd101c88ab21269e (diff) | |
| parent | df7fc05561126f2d3299f02ad0639948ef94d739 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c index 3adec419a45b..a2632d02ce8f 100644 --- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c @@ -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) |