[alsa-devel] [PATCH 068/127] ASoC: use component probe/remove on wm9081

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

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 30eaf4c..a532012 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1254,8 +1254,9 @@ static struct snd_soc_dai_driver wm9081_dai = {
 	.ops = &wm9081_dai_ops,
 };
 
-static int wm9081_probe(struct snd_soc_codec *codec)
+static int wm9081_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);
 
 	/* Enable zero cross by default */
@@ -1275,14 +1276,13 @@ static int wm9081_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
-	.probe = 	wm9081_probe,
-
 	.set_sysclk = wm9081_set_sysclk,
 	.set_bias_level = wm9081_set_bias_level,
 
 	.idle_bias_off = true,
 
 	.component_driver = {
+		.probe			= wm9081_probe,
 		.controls		= wm9081_snd_controls,
 		.num_controls		= ARRAY_SIZE(wm9081_snd_controls),
 		.dapm_widgets		= wm9081_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list