summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-28 19:50:39 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-28 19:51:57 +0100
commitd23511f9590870effa5ace575b59aac18c47175f (patch)
treec30929de930763a8a4930a171478dca9d414dfc3
parentregmap: Add a reusable irq_chip for regmap based interrupt controllers (diff)
downloadlinux-d23511f9590870effa5ace575b59aac18c47175f.tar.xz
linux-d23511f9590870effa5ace575b59aac18c47175f.zip
regmap: Report if we actually handled an interrupt in regmap-irq
While the IRQ core doesn't currently support shared threaded interrupts that's no reason for drivers not to do their bit and report IRQ_NONE when they don't get an interrupt. This allows the core spurious/wedget interrupt detection support to do its thing. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/base/regmap/regmap-irq.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index bd54f63be9ed..6b8a74c3ed18 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -100,6 +100,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
u8 *buf8 = data->status_reg_buf;
u16 *buf16 = data->status_reg_buf;
u32 *buf32 = data->status_reg_buf;
+ bool handled = false;
ret = regmap_bulk_read(map, chip->status_base, data->status_reg_buf,
chip->num_regs);
@@ -146,10 +147,14 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
if (data->status_buf[chip->irqs[i].reg_offset] &
chip->irqs[i].mask) {
handle_nested_irq(data->irq_base + i);
+ handled = true;
}
}
- return IRQ_HANDLED;
+ if (handled)
+ return IRQ_HANDLED;
+ else
+ return IRQ_NONE;
}
/**