Commit b1cc5df6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Luis Henriques

dmaengine: ipu: remove bogus NO_IRQ reference

BugLink: http://bugs.launchpad.net/bugs/1638267

commit 86c7e683 upstream.

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 6ef41cf6 ("dmaengine :ipu: change ipu_irq_handler() to remove compile warning")
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent c12a2390
...@@ -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);
} }
} }
......
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