From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 8 Dec 2011 08:52:19 +0000 (+0800)
Subject: ASoC: Convert WM8804 to table based control init
X-Git-Tag: v3.12-rc1~3017^2~271
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a374524216a244d30c42545ab49f743a43b05c7;p=kernel%2Fkernel-generic.git

ASoC: Convert WM8804 to table based control init

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index ae4b8fb..d54a3ca 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -659,8 +659,6 @@ static int wm8804_probe(struct snd_soc_codec *codec)
 
 	wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-	snd_soc_add_controls(codec, wm8804_snd_controls,
-			     ARRAY_SIZE(wm8804_snd_controls));
 	return 0;
 
 err_reg_enable:
@@ -715,7 +713,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
 	.reg_cache_size = ARRAY_SIZE(wm8804_reg_defs),
 	.reg_word_size = sizeof(u8),
 	.reg_cache_default = wm8804_reg_defs,
-	.volatile_register = wm8804_volatile
+	.volatile_register = wm8804_volatile,
+
+	.controls = wm8804_snd_controls,
+	.num_controls = ARRAY_SIZE(wm8804_snd_controls),
 };
 
 static const struct of_device_id wm8804_of_match[] = {