Commit f35d7633f5adfd7f93c0391b48ef78a14682e6b2
Exists in
smarc_imx_lf-5.15.y
and in
27 other branches
Merge branch 'topic/no_irq' into for-linus
Showing 4 changed files Side-by-side Diff
drivers/dma/ipu/ipu_irq.c
| ... | ... | @@ -286,22 +286,21 @@ |
| 286 | 286 | raw_spin_unlock(&bank_lock); |
| 287 | 287 | while ((line = ffs(status))) { |
| 288 | 288 | struct ipu_irq_map *map; |
| 289 | - unsigned int irq = NO_IRQ; | |
| 289 | + unsigned int irq; | |
| 290 | 290 | |
| 291 | 291 | line--; |
| 292 | 292 | status &= ~(1UL << line); |
| 293 | 293 | |
| 294 | 294 | raw_spin_lock(&bank_lock); |
| 295 | 295 | map = src2map(32 * i + line); |
| 296 | - if (map) | |
| 297 | - irq = map->irq; | |
| 298 | - raw_spin_unlock(&bank_lock); | |
| 299 | - | |
| 300 | 296 | if (!map) { |
| 297 | + raw_spin_unlock(&bank_lock); | |
| 301 | 298 | pr_err("IPU: Interrupt on unmapped source %u bank %d\n", |
| 302 | 299 | line, i); |
| 303 | 300 | continue; |
| 304 | 301 | } |
| 302 | + irq = map->irq; | |
| 303 | + raw_spin_unlock(&bank_lock); | |
| 305 | 304 | generic_handle_irq(irq); |
| 306 | 305 | } |
| 307 | 306 | } |
drivers/dma/moxart-dma.c
drivers/dma/mxs-dma.c
| ... | ... | @@ -428,12 +428,10 @@ |
| 428 | 428 | goto err_alloc; |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | - if (mxs_chan->chan_irq != NO_IRQ) { | |
| 432 | - ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler, | |
| 433 | - 0, "mxs-dma", mxs_dma); | |
| 434 | - if (ret) | |
| 435 | - goto err_irq; | |
| 436 | - } | |
| 431 | + ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler, | |
| 432 | + 0, "mxs-dma", mxs_dma); | |
| 433 | + if (ret) | |
| 434 | + goto err_irq; | |
| 437 | 435 | |
| 438 | 436 | ret = clk_prepare_enable(mxs_dma->clk); |
| 439 | 437 | if (ret) |