[alsa-devel] [PATCH 108/127] ASoC: use component probe/remove on rt5514

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

diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index e0606a5..6f164a1 100644
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -959,8 +959,9 @@ static int rt5514_set_bias_level(struct snd_soc_codec *codec,
 	return 0;
 }
 
-static int rt5514_probe(struct snd_soc_codec *codec)
+static int rt5514_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct rt5514_priv *rt5514 = snd_soc_codec_get_drvdata(codec);
 
 	rt5514->mclk = devm_clk_get(codec->dev, "mclk");
@@ -1020,10 +1021,10 @@ struct snd_soc_dai_driver rt5514_dai[] = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_rt5514 = {
-	.probe = rt5514_probe,
 	.idle_bias_off = true,
 	.set_bias_level = rt5514_set_bias_level,
 	.component_driver = {
+		.probe			= rt5514_probe,
 		.controls		= rt5514_snd_controls,
 		.num_controls		= ARRAY_SIZE(rt5514_snd_controls),
 		.dapm_widgets		= rt5514_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list