From 2f5374d8cf05d8b71f593633bf20972102f591c6 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 3 Dec 2011 11:47:23 +0000 Subject: ASoC: Convert WM8711 to table based control init Signed-off-by: Mark Brown --- sound/soc/codecs/wm8711.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sound/soc/codecs/wm8711.c') 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, -- cgit v1.2.3-59-g8ed1b