Skip to contentSkip to conversation

ASoC: Convert DA7210 to table based DAPM init

PATCH In review Mark Brown 2 participants 3 messages Oct 14, 2011 – Oct 17, 2011

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: Convert DA7210 to table based DAPM init

---
 sound/soc/codecs/da7210.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/da7210.c +3 -3
index ff68247..3b5dc0d 100644
@@ -528,9 +528,6 @@ static int da7210_probe(struct snd_soc_codec *codec)
 	/* Activate all enabled subsystem */
 	snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN);
 
-	snd_soc_add_controls(codec, da7210_snd_controls,
-			     ARRAY_SIZE(da7210_snd_controls));
-
 	dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
 
 	return 0;
@@ -542,6 +539,9 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = {
 	.reg_word_size		= sizeof(u8),
 	.reg_cache_default	= da7210_reg,
 	.volatile_register	= da7210_volatile_register,
+
+	.controls		= da7210_snd_controls,
+	.num_controls		= ARRAY_SIZE(da7210_snd_controls),
 };
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
Signature · 1 line
1.7.6.3
#1 lore raw
Quoted 5 lines · Mark Brown
---
 sound/soc/codecs/da7210.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Is this already applied? Some how I am unable to sync my tree as of now.

author
#2 lore raw
Quoted 1 line · Ashish Chavan

Is this already applied? Some how I am unable to sync my tree as of now.

Yes, for something trivial like this that's obviously correct if it builds I'll generally just go ahead and apply it.