[alsa-devel] [PATCH 114/127] ASoC: use component probe/remove on max98926

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

diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c
index 5830a81..1e3befd 100644
--- a/sound/soc/codecs/max98926.c
+++ b/sound/soc/codecs/max98926.c
@@ -485,8 +485,9 @@ static struct snd_soc_dai_driver max98926_dai[] = {
 }
 };
 
-static int max98926_probe(struct snd_soc_codec *codec)
+static int max98926_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct max98926_priv *max98926 = snd_soc_codec_get_drvdata(codec);
 
 	max98926->codec = codec;
@@ -497,8 +498,8 @@ static int max98926_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_max98926 = {
-	.probe	= max98926_probe,
 	.component_driver = {
+		.probe			= max98926_probe,
 		.controls		= max98926_snd_controls,
 		.num_controls		= ARRAY_SIZE(max98926_snd_controls),
 		.dapm_routes		= max98926_audio_map,
-- 
1.9.1



More information about the Alsa-devel mailing list