[alsa-devel] [PATCH 034/127] ASoC: use component probe/remove on cs42l73

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

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 01b573a..53788f4 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1235,8 +1235,9 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
 	 }
 };
 
-static int cs42l73_probe(struct snd_soc_codec *codec)
+static int cs42l73_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);
 
 	/* Set Charge Pump Frequency */
@@ -1253,11 +1254,11 @@ static int cs42l73_probe(struct snd_soc_codec *codec)
 }
 
 static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {
-	.probe = cs42l73_probe,
 	.set_bias_level = cs42l73_set_bias_level,
 	.suspend_bias_off = true,
 
 	.component_driver = {
+		.probe			= cs42l73_probe,
 		.controls		= cs42l73_snd_controls,
 		.num_controls		= ARRAY_SIZE(cs42l73_snd_controls),
 		.dapm_widgets		= cs42l73_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list