[alsa-devel] [PATCH 029/127] ASoC: use component probe/remove on rt5616

Kuninori Morimoto kuninori.morimoto.gx at renesas.com
Tue Aug 9 07:06:26 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/rt5616.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index e92a149..aae7f73 100644
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -1225,8 +1225,9 @@ static int rt5616_set_bias_level(struct snd_soc_codec *codec,
 	return 0;
 }
 
-static int rt5616_probe(struct snd_soc_codec *codec)
+static int rt5616_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct rt5616_priv *rt5616 = snd_soc_codec_get_drvdata(codec);
 
 	/* Check if MCLK provided */
@@ -1297,12 +1298,12 @@ struct snd_soc_dai_driver rt5616_dai[] = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_rt5616 = {
-	.probe = rt5616_probe,
 	.suspend = rt5616_suspend,
 	.resume = rt5616_resume,
 	.set_bias_level = rt5616_set_bias_level,
 	.idle_bias_off = true,
 	.component_driver = {
+		.probe			= rt5616_probe,
 		.controls		= rt5616_snd_controls,
 		.num_controls		= ARRAY_SIZE(rt5616_snd_controls),
 		.dapm_widgets		= rt5616_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list