[alsa-devel] [PATCH 014/127] ASoC: use component probe/remove on wm8711

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

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 4e8ebef..06dcc468 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -349,8 +349,9 @@ static struct snd_soc_dai_driver wm8711_dai = {
 	.ops = &wm8711_ops,
 };
 
-static int wm8711_probe(struct snd_soc_codec *codec)
+static int wm8711_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	int ret;
 
 	ret = wm8711_reset(codec);
@@ -368,11 +369,11 @@ static int wm8711_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
-	.probe =	wm8711_probe,
 	.set_bias_level = wm8711_set_bias_level,
 	.suspend_bias_off = true,
 
 	.component_driver = {
+		.probe			= wm8711_probe,
 		.controls		= wm8711_snd_controls,
 		.num_controls		= ARRAY_SIZE(wm8711_snd_controls),
 		.dapm_widgets		= wm8711_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list