Commit 86c7e6836479c4045a9a81ed5ea76c51d719f9c1
Committed by
Vinod Koul
Vinod Koul
1 parent
524c6e04f8
Exists in
smarc_imx_lf-5.15.y
and in
27 other branches
dmaengine: ipu: remove bogus NO_IRQ reference
A workaround for a warning introduced a use of the NO_IRQ macro that should have been gone for a long time. It is clear from the code that the value cannot actually be used, but apparently there was a configuration at some point that caused a warning, so instead of just reverting that patch, this rearranges the code in a way that the warning cannot reappear. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 6ef41cf6f721 ("dmaengine :ipu: change ipu_irq_handler() to remove compile warning") Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Showing 1 changed file with 4 additions and 5 deletions 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 | } |