diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-20 19:28:59 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 12:37:59 +0100 |
commit | 2fde6e80dd5460a54651c74b5e5d9a22e4f82af2 (patch) | |
tree | e2f0f18ef8a569d8c3b4d83bb83776b91f8c8f09 /sound/soc/codecs/wm8996.c | |
parent | 889c85c550ebdf8af69f5c08387fde3f6f48d10f (diff) | |
download | op-kernel-dev-2fde6e80dd5460a54651c74b5e5d9a22e4f82af2.zip op-kernel-dev-2fde6e80dd5460a54651c74b5e5d9a22e4f82af2.tar.gz |
ASoC: Optimise WM8996 no interrupt path
This occurs frequently if we are in edge triggered mode as we must poll the
interrupt status register until we get no more interrupts so it's worth
the effort - it means we skip writing null acknowledgements to the chip.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
-rw-r--r-- | sound/soc/codecs/wm8996.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 2a0a612..acbad5b 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2408,6 +2408,9 @@ static irqreturn_t wm8996_irq(int irq, void *data) } irq_val &= ~snd_soc_read(codec, WM8996_INTERRUPT_STATUS_2_MASK); + if (!irq_val) + return IRQ_NONE; + snd_soc_write(codec, WM8996_INTERRUPT_STATUS_2, irq_val); if (irq_val & (WM8996_DCS_DONE_01_EINT | WM8996_DCS_DONE_23_EINT)) { @@ -2426,10 +2429,7 @@ static irqreturn_t wm8996_irq(int irq, void *data) if (irq_val & WM8996_MICD_EINT) wm8996_micd(codec); - if (irq_val) - return IRQ_HANDLED; - else - return IRQ_NONE; + return IRQ_HANDLED; } static irqreturn_t wm8996_edge_irq(int irq, void *data) |