* [PATCH 1/2] ASoC: rt5659: Staticise rt5659_i2c_shutdown
@ 2016-01-12 7:53 Axel Lin
2016-01-12 7:55 ` [PATCH 2/2] ASoC: rt5659: Fix irq leak Axel Lin
2016-01-15 18:18 ` Applied "ASoC: rt5659: Staticise rt5659_i2c_shutdown" " Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Axel Lin @ 2016-01-12 7:53 UTC (permalink / raw)
To: Mark Brown; +Cc: Oder Chiou, Bard Liao, alsa-devel, Liam Girdwood
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/rt5659.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 820d8fa..47c717f4 100644
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -4184,7 +4184,7 @@ static int rt5659_i2c_remove(struct i2c_client *i2c)
return 0;
}
-void rt5659_i2c_shutdown(struct i2c_client *client)
+static void rt5659_i2c_shutdown(struct i2c_client *client)
{
struct rt5659_priv *rt5659 = i2c_get_clientdata(client);
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ASoC: rt5659: Fix irq leak
2016-01-12 7:53 [PATCH 1/2] ASoC: rt5659: Staticise rt5659_i2c_shutdown Axel Lin
@ 2016-01-12 7:55 ` Axel Lin
2016-01-15 18:18 ` Applied "ASoC: rt5659: Fix irq leak" to the asoc tree Mark Brown
2016-01-15 18:18 ` Applied "ASoC: rt5659: Staticise rt5659_i2c_shutdown" " Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Axel Lin @ 2016-01-12 7:55 UTC (permalink / raw)
To: Mark Brown; +Cc: Oder Chiou, Bard Liao, alsa-devel, Liam Girdwood
Use devm_request_threaded_irq to ensure the irq is freed when unload the
module. The rt5659->i2c is no longer used after this conversion, thus
remove it as well.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/rt5659.c | 16 ++++------------
sound/soc/codecs/rt5659.h | 1 -
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 47c717f4..1701c29 100644
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -3985,7 +3985,6 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
if (rt5659 == NULL)
return -ENOMEM;
- rt5659->i2c = i2c;
i2c_set_clientdata(i2c, rt5659);
if (pdata)
@@ -4157,24 +4156,17 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
INIT_DELAYED_WORK(&rt5659->jack_detect_work, rt5659_jack_detect_work);
- if (rt5659->i2c->irq) {
- ret = request_threaded_irq(rt5659->i2c->irq, NULL, rt5659_irq,
- IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
+ if (i2c->irq) {
+ ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
+ rt5659_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
| IRQF_ONESHOT, "rt5659", rt5659);
if (ret)
dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
}
- ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,
+ return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,
rt5659_dai, ARRAY_SIZE(rt5659_dai));
-
- if (ret) {
- if (rt5659->i2c->irq)
- free_irq(rt5659->i2c->irq, rt5659);
- }
-
- return 0;
}
static int rt5659_i2c_remove(struct i2c_client *i2c)
diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h
index 8f07ee9..d31c9e5 100644
--- a/sound/soc/codecs/rt5659.h
+++ b/sound/soc/codecs/rt5659.h
@@ -1792,7 +1792,6 @@ struct rt5659_priv {
struct snd_soc_codec *codec;
struct rt5659_platform_data pdata;
struct regmap *regmap;
- struct i2c_client *i2c;
struct gpio_desc *gpiod_ldo1_en;
struct gpio_desc *gpiod_reset;
struct snd_soc_jack *hs_jack;
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Applied "ASoC: rt5659: Staticise rt5659_i2c_shutdown" to the asoc tree
2016-01-12 7:53 [PATCH 1/2] ASoC: rt5659: Staticise rt5659_i2c_shutdown Axel Lin
2016-01-12 7:55 ` [PATCH 2/2] ASoC: rt5659: Fix irq leak Axel Lin
@ 2016-01-15 18:18 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2016-01-15 18:18 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: alsa-devel
The patch
ASoC: rt5659: Staticise rt5659_i2c_shutdown
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 c62db3d5abf89ca5502c7fe1f869c2862e48336d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 12 Jan 2016 15:53:46 +0800
Subject: [PATCH] ASoC: rt5659: Staticise rt5659_i2c_shutdown
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/rt5659.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 820d8fa62b5e..47c717f4964a 100644
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -4184,7 +4184,7 @@ static int rt5659_i2c_remove(struct i2c_client *i2c)
return 0;
}
-void rt5659_i2c_shutdown(struct i2c_client *client)
+static void rt5659_i2c_shutdown(struct i2c_client *client)
{
struct rt5659_priv *rt5659 = i2c_get_clientdata(client);
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Applied "ASoC: rt5659: Fix irq leak" to the asoc tree
2016-01-12 7:55 ` [PATCH 2/2] ASoC: rt5659: Fix irq leak Axel Lin
@ 2016-01-15 18:18 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2016-01-15 18:18 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: alsa-devel
The patch
ASoC: rt5659: Fix irq leak
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 1ca2cf8c4167c2016d9716998b4f89c4e79d1f89 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 12 Jan 2016 15:55:17 +0800
Subject: [PATCH] ASoC: rt5659: Fix irq leak
Use devm_request_threaded_irq to ensure the irq is freed when unload the
module. The rt5659->i2c is no longer used after this conversion, thus
remove it as well.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/rt5659.c | 16 ++++------------
sound/soc/codecs/rt5659.h | 1 -
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 820d8fa62b5e..c166d9394c69 100644
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -3985,7 +3985,6 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
if (rt5659 == NULL)
return -ENOMEM;
- rt5659->i2c = i2c;
i2c_set_clientdata(i2c, rt5659);
if (pdata)
@@ -4157,24 +4156,17 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
INIT_DELAYED_WORK(&rt5659->jack_detect_work, rt5659_jack_detect_work);
- if (rt5659->i2c->irq) {
- ret = request_threaded_irq(rt5659->i2c->irq, NULL, rt5659_irq,
- IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
+ if (i2c->irq) {
+ ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
+ rt5659_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
| IRQF_ONESHOT, "rt5659", rt5659);
if (ret)
dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
}
- ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,
+ return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,
rt5659_dai, ARRAY_SIZE(rt5659_dai));
-
- if (ret) {
- if (rt5659->i2c->irq)
- free_irq(rt5659->i2c->irq, rt5659);
- }
-
- return 0;
}
static int rt5659_i2c_remove(struct i2c_client *i2c)
diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h
index 8f07ee903eaa..d31c9e5bcec8 100644
--- a/sound/soc/codecs/rt5659.h
+++ b/sound/soc/codecs/rt5659.h
@@ -1792,7 +1792,6 @@ struct rt5659_priv {
struct snd_soc_codec *codec;
struct rt5659_platform_data pdata;
struct regmap *regmap;
- struct i2c_client *i2c;
struct gpio_desc *gpiod_ldo1_en;
struct gpio_desc *gpiod_reset;
struct snd_soc_jack *hs_jack;
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-15 18:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12 7:53 [PATCH 1/2] ASoC: rt5659: Staticise rt5659_i2c_shutdown Axel Lin
2016-01-12 7:55 ` [PATCH 2/2] ASoC: rt5659: Fix irq leak Axel Lin
2016-01-15 18:18 ` Applied "ASoC: rt5659: Fix irq leak" to the asoc tree Mark Brown
2016-01-15 18:18 ` Applied "ASoC: rt5659: Staticise rt5659_i2c_shutdown" " Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).