[alsa-devel] [PATCH 1/3] Revert "ASoC: wm0010: Add missing IRQF_ONESHOT"
This reverts 58d468328646 ("ASoC: wm0010: Add missing IRQF_ONESHOT").
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 --- sound/soc/codecs/wm0010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 6560a66..ff924032 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -953,7 +953,7 @@ static int wm0010_spi_probe(struct spi_device *spi) trigger = IRQF_TRIGGER_FALLING; trigger |= IRQF_ONESHOT;
- ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger | IRQF_ONESHOT, + ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger, "wm0010", wm0010); if (ret) { dev_err(wm0010->dev, "Failed to request IRQ %d: %d\n",
This reverts 3d907cc30d07 ("ASoC: wm5100: 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 --- sound/soc/codecs/wm5100.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 4c10cd8..98495dd 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2570,13 +2570,11 @@ static int wm5100_i2c_probe(struct i2c_client *i2c,
if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) ret = request_threaded_irq(i2c->irq, NULL, - wm5100_edge_irq, - irq_flags | IRQF_ONESHOT, + wm5100_edge_irq, irq_flags, "wm5100", wm5100); else ret = request_threaded_irq(i2c->irq, NULL, wm5100_irq, - irq_flags | IRQF_ONESHOT, - "wm5100", + irq_flags, "wm5100", wm5100);
if (ret != 0) {
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 --- sound/soc/codecs/wm8996.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 3dd063f..370459f 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) if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) ret = request_threaded_irq(i2c->irq, NULL, wm8996_edge_irq, - irq_flags | IRQF_ONESHOT, - "wm8996", codec); + irq_flags, "wm8996", codec); else ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq, - irq_flags | IRQF_ONESHOT, - "wm8996", codec); + irq_flags, "wm8996", codec);
if (ret == 0) { /* Unmask the interrupt */
On Thu, Jul 02, 2015 at 09:29:01PM +0800, Axel Lin wrote:
This reverts ed043aebe6ec ("ASoC: wm8996: Pass the IRQF_ONESHOT flag").
Please use subject lines reflecting the style for the subsystem, even for reverts.
2015-07-09 2:34 GMT+08:00 Mark Brown broonie@kernel.org:
On Thu, Jul 02, 2015 at 09:29:01PM +0800, Axel Lin wrote:
This reverts ed043aebe6ec ("ASoC: wm8996: Pass the IRQF_ONESHOT flag").
Please use subject lines reflecting the style for the subsystem, even for reverts.
I don't get it. I thought if a patch is actually a revert, it should look like a revert. So I generate the patch by "git revert". Is that wrong?
On Thu, Jul 09, 2015 at 09:52:23AM +0800, Axel Lin wrote:
2015-07-09 2:34 GMT+08:00 Mark Brown broonie@kernel.org:
On Thu, Jul 02, 2015 at 09:29:01PM +0800, Axel Lin wrote:
This reverts ed043aebe6ec ("ASoC: wm8996: Pass the IRQF_ONESHOT flag").
Please use subject lines reflecting the style for the subsystem, even for reverts.
I don't get it. I thought if a patch is actually a revert, it should look like a revert. So I generate the patch by "git revert". Is that wrong?
You should edit the default subject line to be a normal subject line. Reverts are patches like any other.
On Thu, Jul 02, 2015 at 09:26:44PM +0800, Axel Lin wrote:
This reverts 58d468328646 ("ASoC: wm0010: Add missing IRQF_ONESHOT").
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
For the whole series:
Acked-by: Charles Keepax ckeepax@opensource.wolfsonmicro.com
Thanks, Charles
On Thu, Jul 2, 2015 at 10:26 AM, Axel Lin axel.lin@ingics.com wrote:
This reverts 58d468328646 ("ASoC: wm0010: Add missing IRQF_ONESHOT").
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
Ops, sorry about that:
Reviewed-by: Fabio Estevam fabio.estevam@freescale.com
The patch
ASoC: wm0010: Remove spurious missing IRQF_ONESHOT
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 030e6ee241f0586308622bcdd273a317976b3169 Mon Sep 17 00:00:00 2001
From: Axel Lin axel.lin@ingics.com Date: Thu, 2 Jul 2015 21:26:44 +0800 Subject: [PATCH] ASoC: wm0010: Remove spurious missing IRQF_ONESHOT
This reverts 58d468328646 ("ASoC: wm0010: Add missing IRQF_ONESHOT").
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 --- sound/soc/codecs/wm0010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index e1da49f39334..f2c6ad4b8fde 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -953,7 +953,7 @@ static int wm0010_spi_probe(struct spi_device *spi) trigger = IRQF_TRIGGER_FALLING; trigger |= IRQF_ONESHOT;
- ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger | IRQF_ONESHOT, + ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger, "wm0010", wm0010); if (ret) { dev_err(wm0010->dev, "Failed to request IRQ %d: %d\n",
participants (4)
-
Axel Lin -
Charles Keepax -
Fabio Estevam -
Mark Brown