diff options
author | Axel Lin <axel.lin@ingics.com> | 2015-07-02 09:29:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-08 14:33:49 -0400 |
commit | ca94085139d4874701af4f149bebfb05e105b245 (patch) | |
tree | 49ae0fe036acbe21e5afda574932ec2d462ff104 /sound | |
parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) |
ASoC: wm8996: Remove spurious IRQF_ONESHOT flag
This reverts ed043aebe6ec ("ASoC: wm8996: Pass the IRQF_ONESHOT flag").
The coccinelle warnings is false positive because the original code does
set IRQF_ONESHOT by "trigger |= IRQF_ONESHOT;".
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8996.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 3dd063f682b2..370459fcf21c 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c | |||
@@ -2647,12 +2647,10 @@ static int wm8996_probe(struct snd_soc_codec *codec) | |||
2647 | if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) | 2647 | if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) |
2648 | ret = request_threaded_irq(i2c->irq, NULL, | 2648 | ret = request_threaded_irq(i2c->irq, NULL, |
2649 | wm8996_edge_irq, | 2649 | wm8996_edge_irq, |
2650 | irq_flags | IRQF_ONESHOT, | 2650 | irq_flags, "wm8996", codec); |
2651 | "wm8996", codec); | ||
2652 | else | 2651 | else |
2653 | ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq, | 2652 | ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq, |
2654 | irq_flags | IRQF_ONESHOT, | 2653 | irq_flags, "wm8996", codec); |
2655 | "wm8996", codec); | ||
2656 | 2654 | ||
2657 | if (ret == 0) { | 2655 | if (ret == 0) { |
2658 | /* Unmask the interrupt */ | 2656 | /* Unmask the interrupt */ |