Commit f35d7633 authored by Vinod Koul's avatar Vinod Koul

Merge branch 'topic/no_irq' into for-linus

parents 4dfc9afe 86c7e683
...@@ -286,22 +286,21 @@ static void ipu_irq_handler(struct irq_desc *desc) ...@@ -286,22 +286,21 @@ static void ipu_irq_handler(struct irq_desc *desc)
raw_spin_unlock(&bank_lock); raw_spin_unlock(&bank_lock);
while ((line = ffs(status))) { while ((line = ffs(status))) {
struct ipu_irq_map *map; struct ipu_irq_map *map;
unsigned int irq = NO_IRQ; unsigned int irq;
line--; line--;
status &= ~(1UL << line); status &= ~(1UL << line);
raw_spin_lock(&bank_lock); raw_spin_lock(&bank_lock);
map = src2map(32 * i + line); map = src2map(32 * i + line);
if (map)
irq = map->irq;
raw_spin_unlock(&bank_lock);
if (!map) { if (!map) {
raw_spin_unlock(&bank_lock);
pr_err("IPU: Interrupt on unmapped source %u bank %d\n", pr_err("IPU: Interrupt on unmapped source %u bank %d\n",
line, i); line, i);
continue; continue;
} }
irq = map->irq;
raw_spin_unlock(&bank_lock);
generic_handle_irq(irq); generic_handle_irq(irq);
} }
} }
......
...@@ -579,7 +579,7 @@ static int moxart_probe(struct platform_device *pdev) ...@@ -579,7 +579,7 @@ static int moxart_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
irq = irq_of_parse_and_map(node, 0); irq = irq_of_parse_and_map(node, 0);
if (irq == NO_IRQ) { if (!irq) {
dev_err(dev, "no IRQ resource\n"); dev_err(dev, "no IRQ resource\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -428,12 +428,10 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) ...@@ -428,12 +428,10 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
goto err_alloc; goto err_alloc;
} }
if (mxs_chan->chan_irq != NO_IRQ) {
ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler, ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler,
0, "mxs-dma", mxs_dma); 0, "mxs-dma", mxs_dma);
if (ret) if (ret)
goto err_irq; goto err_irq;
}
ret = clk_prepare_enable(mxs_dma->clk); ret = clk_prepare_enable(mxs_dma->clk);
if (ret) if (ret)
......
...@@ -866,7 +866,7 @@ static int sirfsoc_dma_probe(struct platform_device *op) ...@@ -866,7 +866,7 @@ static int sirfsoc_dma_probe(struct platform_device *op)
} }
sdma->irq = irq_of_parse_and_map(dn, 0); sdma->irq = irq_of_parse_and_map(dn, 0);
if (sdma->irq == NO_IRQ) { if (!sdma->irq) {
dev_err(dev, "Error mapping IRQ!\n"); dev_err(dev, "Error mapping IRQ!\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment