diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 19:22:02 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-09-05 07:10:52 -0400 |
commit | 86c7e6836479c4045a9a81ed5ea76c51d719f9c1 (patch) | |
tree | f026612cf5a3821aa4cbf1a91e4cb237b1a41fd7 | |
parent | 524c6e04f826cea8a34a27136d8f5925df9213ed (diff) |
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>
-rw-r--r-- | drivers/dma/ipu/ipu_irq.c | 9 |
1 files changed, 4 insertions, 5 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) | |||
286 | raw_spin_unlock(&bank_lock); | 286 | raw_spin_unlock(&bank_lock); |
287 | while ((line = ffs(status))) { | 287 | while ((line = ffs(status))) { |
288 | struct ipu_irq_map *map; | 288 | struct ipu_irq_map *map; |
289 | unsigned int irq = NO_IRQ; | 289 | unsigned int irq; |
290 | 290 | ||
291 | line--; | 291 | line--; |
292 | status &= ~(1UL << line); | 292 | status &= ~(1UL << line); |
293 | 293 | ||
294 | raw_spin_lock(&bank_lock); | 294 | raw_spin_lock(&bank_lock); |
295 | map = src2map(32 * i + line); | 295 | map = src2map(32 * i + line); |
296 | if (map) | ||
297 | irq = map->irq; | ||
298 | raw_spin_unlock(&bank_lock); | ||
299 | |||
300 | if (!map) { | 296 | if (!map) { |
297 | raw_spin_unlock(&bank_lock); | ||
301 | pr_err("IPU: Interrupt on unmapped source %u bank %d\n", | 298 | pr_err("IPU: Interrupt on unmapped source %u bank %d\n", |
302 | line, i); | 299 | line, i); |
303 | continue; | 300 | continue; |
304 | } | 301 | } |
302 | irq = map->irq; | ||
303 | raw_spin_unlock(&bank_lock); | ||
305 | generic_handle_irq(irq); | 304 | generic_handle_irq(irq); |
306 | } | 305 | } |
307 | } | 306 | } |