[alsa-devel] [PATCH 026/127] ASoC: use component probe/remove on ssm2602

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

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 993bde2..2b898e4 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -559,8 +559,9 @@ static int ssm2604_codec_probe(struct snd_soc_codec *codec)
 			ARRAY_SIZE(ssm2604_routes));
 }
 
-static int ssm260x_codec_probe(struct snd_soc_codec *codec)
+static int ssm260x_codec_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
 	int ret;
 
@@ -592,12 +593,12 @@ static int ssm260x_codec_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = {
-	.probe =	ssm260x_codec_probe,
 	.resume =	ssm2602_resume,
 	.set_bias_level = ssm2602_set_bias_level,
 	.suspend_bias_off = true,
 
 	.component_driver = {
+		.probe			= ssm260x_codec_probe,
 		.controls		= ssm260x_snd_controls,
 		.num_controls		= ARRAY_SIZE(ssm260x_snd_controls),
 		.dapm_widgets		= ssm260x_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list