From: Mark Brown Date: Sat, 3 Dec 2011 11:49:02 +0000 (+0000) Subject: ASoC: Convert WM8728 to table based control init X-Git-Tag: firefly_0821_release~3680^2~2691^2~307 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e41d5a3b7a04e9b82279293055d09cb8164ec29e;p=firefly-linux-kernel-4.4.55.git ASoC: Convert WM8728 to table based control init Signed-off-by: Mark Brown --- 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,