[alsa-devel] [PATCH 037/127] ASoC: use component probe/remove on cs42l51

Kuninori Morimoto kuninori.morimoto.gx at renesas.com
Tue Aug 9 07:10:20 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/cs42l51.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 96cfe38..c331193 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -484,8 +484,9 @@ static struct snd_soc_dai_driver cs42l51_dai = {
 	.ops = &cs42l51_dai_ops,
 };
 
-static int cs42l51_codec_probe(struct snd_soc_codec *codec)
+static int cs42l51_codec_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	int ret, reg;
 
 	/*
@@ -505,9 +506,8 @@ static int cs42l51_codec_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
-	.probe = cs42l51_codec_probe,
-
 	.component_driver = {
+		.probe			= cs42l51_codec_probe,
 		.controls		= cs42l51_snd_controls,
 		.num_controls		= ARRAY_SIZE(cs42l51_snd_controls),
 		.dapm_widgets		= cs42l51_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list