[alsa-devel] [PATCH 099/127] ASoC: use component probe/remove on tlv320aic26

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

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 14aa96d..da5cc5f 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -291,8 +291,9 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
 /* ---------------------------------------------------------------------
  * SoC CODEC portion of driver: probe and release routines
  */
-static int aic26_probe(struct snd_soc_codec *codec)
+static int aic26_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 	struct aic26 *aic26 = dev_get_drvdata(codec->dev);
 	int ret, reg;
 
@@ -320,8 +321,8 @@ static int aic26_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver aic26_soc_codec_dev = {
-	.probe = aic26_probe,
 	.component_driver = {
+		.probe			= aic26_probe,
 		.controls		= aic26_snd_controls,
 		.num_controls		= ARRAY_SIZE(aic26_snd_controls),
 		.dapm_widgets		= tlv320aic26_dapm_widgets,
-- 
1.9.1



More information about the Alsa-devel mailing list