diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-03 15:47:23 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 01:35:17 +0400 |
| commit | 2f5374d8cf05d8b71f593633bf20972102f591c6 (patch) | |
| tree | d031236ac6ae16cd1a7c600c114714f3b586990a /sound/soc/codecs/wm8711.c | |
| parent | 0f185e3f8b06c1d0fd817af3d4c03f9c21d776e9 (diff) | |
| download | linux-2f5374d8cf05d8b71f593633bf20972102f591c6.tar.xz | |
ASoC: Convert WM8711 to table based control init
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8711.c')
| -rw-r--r-- | sound/soc/codecs/wm8711.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index b9b1a2f8360f..0b76d1dca5ea 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -374,9 +374,6 @@ static int wm8711_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100); - snd_soc_add_controls(codec, wm8711_snd_controls, - ARRAY_SIZE(wm8711_snd_controls)); - return ret; } @@ -397,6 +394,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = { .reg_cache_size = ARRAY_SIZE(wm8711_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8711_reg, + .controls = wm8711_snd_controls, + .num_controls = ARRAY_SIZE(wm8711_snd_controls), .dapm_widgets = wm8711_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8711_dapm_widgets), .dapm_routes = wm8711_intercon, |