Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f35d7633 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/no_irq' into for-linus

parents 4dfc9afe 86c7e683

drivers/dma/ipu/ipu_irq.c

+4 −5
Original line number Diff line number Diff line
@@ -286,22 +286,21 @@ static void ipu_irq_handler(struct irq_desc *desc) 
		raw_spin_unlock(&bank_lock);

		while ((line = ffs(status))) {

			struct ipu_irq_map *map;

			unsigned int irq = NO_IRQ;

			unsigned int irq;



			line--;

			status &= ~(1UL << line);



			raw_spin_lock(&bank_lock);

			map = src2map(32 * i + line);

			if (map)

				irq = map->irq;

			raw_spin_unlock(&bank_lock);



			if (!map) {

				raw_spin_unlock(&bank_lock);

				pr_err("IPU: Interrupt on unmapped source %u bank %d\n",

				       line, i);

				continue;

			}

			irq = map->irq;

			raw_spin_unlock(&bank_lock);

			generic_handle_irq(irq);

		}

	}

drivers/dma/moxart-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static int moxart_probe(struct platform_device *pdev) 
		return -ENOMEM;



	irq = irq_of_parse_and_map(node, 0);

	if (irq == NO_IRQ) {

	if (!irq) {

		dev_err(dev, "no IRQ resource\n");

		return -EINVAL;

	}

drivers/dma/mxs-dma.c

+4 −6
Original line number Diff line number Diff line
@@ -428,12 +428,10 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) 
		goto err_alloc;

	}



	if (mxs_chan->chan_irq != NO_IRQ) {

	ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler,

			  0, "mxs-dma", mxs_dma);

	if (ret)

		goto err_irq;

	}



	ret = clk_prepare_enable(mxs_dma->clk);

	if (ret)

drivers/dma/sirf-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static int sirfsoc_dma_probe(struct platform_device *op) 
	}



	sdma->irq = irq_of_parse_and_map(dn, 0);

	if (sdma->irq == NO_IRQ) {

	if (!sdma->irq) {

		dev_err(dev, "Error mapping IRQ!\n");

		return -EINVAL;

	}