Commit fd286a1d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/xilinx' 

- Remove redundant dev_err(), since platform_get_irq() and
  platform_get_irq_byname() already log errors (Yang Li)

- Fix uninitialized symbols in xilinx_pl_dma_pcie_setup_irq() (Krzysztof
  Wilczyński)

- Fix xilinx_pl_dma_pcie_init_irq_domain() error return when
  irq_domain_add_linear() fails (Harshit Mogalapalli)

* pci/controller/xilinx:
  PCI: xilinx-xdma: Fix error code in xilinx_pl_dma_pcie_init_irq_domain()
  PCI: xilinx-xdma: Fix uninitialized symbols in xilinx_pl_dma_pcie_setup_irq()
  PCI: xilinx-xdma: Remove redundant dev_err()
parents 161d42df 2324be17

drivers/pci/controller/pcie-xilinx-dma-pl.c

+5 −9
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int xilinx_pl_dma_pcie_init_irq_domain(struct pl_dma_pcie *port) 
						  &intx_domain_ops, port);

	if (!port->intx_domain) {

		dev_err(dev, "Failed to get a INTx IRQ domain\n");

		return PTR_ERR(port->intx_domain);

		return -ENOMEM;

	}



	irq_domain_update_bus_token(port->intx_domain, DOMAIN_BUS_WIRED);
@@ -635,14 +635,14 @@ static int xilinx_pl_dma_pcie_setup_irq(struct pl_dma_pcie *port) 
	err = devm_request_irq(dev, port->intx_irq, xilinx_pl_dma_pcie_intx_flow,

			       IRQF_SHARED | IRQF_NO_THREAD, NULL, port);

	if (err) {

		dev_err(dev, "Failed to request INTx IRQ %d\n", irq);

		dev_err(dev, "Failed to request INTx IRQ %d\n", port->intx_irq);

		return err;

	}



	err = devm_request_irq(dev, port->irq, xilinx_pl_dma_pcie_event_flow,

			       IRQF_SHARED | IRQF_NO_THREAD, NULL, port);

	if (err) {

		dev_err(dev, "Failed to request event IRQ %d\n", irq);

		dev_err(dev, "Failed to request event IRQ %d\n", port->irq);

		return err;

	}
@@ -684,10 +684,8 @@ static int xilinx_request_msi_irq(struct pl_dma_pcie *port) 
	int ret;



	port->msi.irq_msi0 = platform_get_irq_byname(pdev, "msi0");

	if (port->msi.irq_msi0 <= 0) {

		dev_err(dev, "Unable to find msi0 IRQ line\n");

	if (port->msi.irq_msi0 <= 0)

		return port->msi.irq_msi0;

	}



	ret = devm_request_irq(dev, port->msi.irq_msi0, xilinx_pl_dma_pcie_msi_handler_low,

			       IRQF_SHARED | IRQF_NO_THREAD, "xlnx-pcie-dma-pl",
@@ -698,10 +696,8 @@ static int xilinx_request_msi_irq(struct pl_dma_pcie *port) 
	}



	port->msi.irq_msi1 = platform_get_irq_byname(pdev, "msi1");

	if (port->msi.irq_msi1 <= 0) {

		dev_err(dev, "Unable to find msi1 IRQ line\n");

	if (port->msi.irq_msi1 <= 0)

		return port->msi.irq_msi1;

	}



	ret = devm_request_irq(dev, port->msi.irq_msi1, xilinx_pl_dma_pcie_msi_handler_high,

			       IRQF_SHARED | IRQF_NO_THREAD, "xlnx-pcie-dma-pl",