[alsa-devel] [PATCH 083/127] ASoC: use component probe/remove on wm8900

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

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 724cec4..ebe6ef0 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1175,8 +1175,9 @@ static int wm8900_resume(struct snd_soc_codec *codec)
 	return 0;
 }
 
-static int wm8900_probe(struct snd_soc_codec *codec)
+static int wm8900_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	int reg;
 
 	reg = snd_soc_read(codec, WM8900_REG_ID);
@@ -1209,12 +1210,12 @@ static int wm8900_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_wm8900 = {
-	.probe =	wm8900_probe,
 	.suspend =	wm8900_suspend,
 	.resume =	wm8900_resume,
 	.set_bias_level = wm8900_set_bias_level,
 
 	.component_driver = {
+		.probe			= wm8900_probe,
 		.controls		= wm8900_snd_controls,
 		.num_controls		= ARRAY_SIZE(wm8900_snd_controls),
 		.dapm_widgets		= wm8900_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list