summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 11:49:02 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 21:35:18 +0000
commite41d5a3b7a04e9b82279293055d09cb8164ec29e (patch)
tree16c6cb5e30541b3875a34f8dee49f882ca4defb2
parent2f5374d8cf05d8b71f593633bf20972102f591c6 (diff)
downloadlinux-stable-e41d5a3b7a04e9b82279293055d09cb8164ec29e.tar.gz
linux-stable-e41d5a3b7a04e9b82279293055d09cb8164ec29e.tar.bz2
linux-stable-e41d5a3b7a04e9b82279293055d09cb8164ec29e.zip
ASoC: Convert WM8728 to table based control init
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8728.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index b1f01d9273be..fc3d59e49084 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -243,9 +243,6 @@ static int wm8728_probe(struct snd_soc_codec *codec)
/* power on device */
wm8728_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
- snd_soc_add_controls(codec, wm8728_snd_controls,
- ARRAY_SIZE(wm8728_snd_controls));
-
return ret;
}
@@ -264,6 +261,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
.reg_cache_size = ARRAY_SIZE(wm8728_reg_defaults),
.reg_word_size = sizeof(u16),
.reg_cache_default = wm8728_reg_defaults,
+ .controls = wm8728_snd_controls,
+ .num_controls = ARRAY_SIZE(wm8728_snd_controls),
.dapm_widgets = wm8728_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets),
.dapm_routes = wm8728_intercon,