diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:18:29 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:18:29 +0530 |
| commit | f35d7633f5adfd7f93c0391b48ef78a14682e6b2 (patch) | |
| tree | 1b78835a9a527c246385e0c003c145eea33a83d6 | |
| parent | 4dfc9afe0d46caa309c5eaede841551d4056fefc (diff) | |
| parent | 86c7e6836479c4045a9a81ed5ea76c51d719f9c1 (diff) | |
Merge branch 'topic/no_irq' into for-linus
| -rw-r--r-- | drivers/dma/ipu/ipu_irq.c | 9 | ||||
| -rw-r--r-- | drivers/dma/moxart-dma.c | 2 | ||||
| -rw-r--r-- | drivers/dma/mxs-dma.c | 10 | ||||
| -rw-r--r-- | drivers/dma/sirf-dma.c | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index 2bf37e68ad0f..dd184b50e5b4 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c @@ -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); } } diff --git a/drivers/dma/moxart-dma.c b/drivers/dma/moxart-dma.c index a6e642792e5a..e1a5c2242f6f 100644 --- a/drivers/dma/moxart-dma.c +++ b/drivers/dma/moxart-dma.c @@ -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; } diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 50e64e113ffb..e217268c7098 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -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 = 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) diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index a96e4a480de5..8f62edad51be 100644 --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c @@ -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; } |