[alsa-devel] [PATCH 122/127] ASoC: use component probe/remove on jz4740

Kuninori Morimoto kuninori.morimoto.gx at renesas.com
Tue Aug 9 07:44:10 CEST 2016


From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>

codec driver and component driver has duplicated .probe/.remove
functions, and codec side is just relayed it. This was quick-hack,
but no longer needed.
This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
 sound/soc/codecs/jz4740.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index 0290fab..8891bcd 100644
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -283,8 +283,9 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec,
 	return 0;
 }
 
-static int jz4740_codec_dev_probe(struct snd_soc_codec *codec)
+static int jz4740_codec_dev_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct jz4740_codec *jz4740_codec = snd_soc_codec_get_drvdata(codec);
 
 	regmap_update_bits(jz4740_codec->regmap, JZ4740_REG_CODEC_1,
@@ -294,11 +295,11 @@ static int jz4740_codec_dev_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_jz4740_codec = {
-	.probe = jz4740_codec_dev_probe,
 	.set_bias_level = jz4740_codec_set_bias_level,
 	.suspend_bias_off = true,
 
 	.component_driver = {
+		.probe			= jz4740_codec_dev_probe,
 		.controls		= jz4740_codec_controls,
 		.num_controls		= ARRAY_SIZE(jz4740_codec_controls),
 		.dapm_widgets		= jz4740_codec_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list