diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-03 01:22:02 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-09-05 16:40:52 +0530 |
| commit | 86c7e6836479c4045a9a81ed5ea76c51d719f9c1 (patch) | |
| tree | f026612cf5a3821aa4cbf1a91e4cb237b1a41fd7 /drivers/dma | |
| parent | 524c6e04f826cea8a34a27136d8f5925df9213ed (diff) | |
| download | linux-stable-86c7e6836479c4045a9a81ed5ea76c51d719f9c1.tar.gz linux-stable-86c7e6836479c4045a9a81ed5ea76c51d719f9c1.tar.bz2 linux-stable-86c7e6836479c4045a9a81ed5ea76c51d719f9c1.zip | |
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>
Diffstat (limited to 'drivers/dma')
| -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) 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); } } |