Commit 0a09e231 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/dwc-edma' 

- Verify that if DT specifies a single IRQ for all eDMA channels, it is
  named 'dma' (Niklas Cassel)

- Remove qcom edma.nr_irqs initialization, which is redundant since
  dw_pcie_edma_irq_verify() initializes it based on whether the DT contains
  'dma' (single IRQ) or 'dmaX' (multiple IRQs) (Niklas Cassel)

* pci/controller/dwc-edma:
  PCI: qcom-ep: Remove redundant edma.nr_irqs initialization
  PCI: dwc: Verify the single eDMA IRQ in dw_pcie_edma_irq_verify()
parents f2b2fcf6 eea30c76

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

+1 −3
Original line number Diff line number Diff line
@@ -981,9 +981,7 @@ static int dw_pcie_edma_irq_verify(struct dw_pcie *pci) 
	char name[15];

	int ret;



	if (pci->edma.nr_irqs == 1)

		return 0;

	else if (pci->edma.nr_irqs > 1)

	if (pci->edma.nr_irqs > 1)

		return pci->edma.nr_irqs != ch_cnt ? -EINVAL : 0;



	ret = platform_get_irq_byname_optional(pdev, "dma");

drivers/pci/controller/dwc/pcie-qcom-ep.c

+0 −1
Original line number Diff line number Diff line
@@ -873,7 +873,6 @@ static int qcom_pcie_ep_probe(struct platform_device *pdev) 
	pcie_ep->pci.dev = dev;

	pcie_ep->pci.ops = &pci_ops;

	pcie_ep->pci.ep.ops = &pci_ep_ops;

	pcie_ep->pci.edma.nr_irqs = 1;



	pcie_ep->cfg = of_device_get_match_data(dev);

	if (pcie_ep->cfg && pcie_ep->cfg->hdma_support) {