[alsa-devel] [PATCH 094/127] ASoC: use component probe/remove on uda134x

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

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index a4a3e98..d78de75 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -446,8 +446,9 @@ static struct snd_soc_dai_driver uda134x_dai = {
 	.ops = &uda134x_dai_ops,
 };
 
-static int uda134x_soc_probe(struct snd_soc_codec *codec)
+static int uda134x_soc_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
 	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);
 	struct uda134x_platform_data *pd = uda134x->pd;
@@ -519,11 +520,11 @@ static int uda134x_soc_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
-	.probe =        uda134x_soc_probe,
 	.set_bias_level = uda134x_set_bias_level,
 	.suspend_bias_off = true,
 
 	.component_driver = {
+		.probe			= uda134x_soc_probe,
 		.dapm_widgets		= uda134x_dapm_widgets,
 		.num_dapm_widgets	= ARRAY_SIZE(uda134x_dapm_widgets),
 		.dapm_routes		= uda134x_dapm_routes,
-- 
1.9.1



More information about the Alsa-devel mailing list