From: Mark Brown Date: Fri, 2 Dec 2011 18:21:28 +0000 (+0000) Subject: ASoC: Use table based control init for WM8903 X-Git-Tag: firefly_0821_release~3680^2~2691^2~331 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4a10837c9dd473cd615766cf38f33a3c1f745cf;p=firefly-linux-kernel-4.4.55.git ASoC: Use table based control init for WM8903 Signed-off-by: Mark Brown Tested-by: Stephen Warren --- diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 12eedaf938d7..76c7c2bd3cd1 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -2034,9 +2034,6 @@ static int wm8903_probe(struct snd_soc_codec *codec) WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE, WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE); - snd_soc_add_controls(codec, wm8903_snd_controls, - ARRAY_SIZE(wm8903_snd_controls)); - wm8903_init_gpio(codec); return ret; @@ -2066,6 +2063,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = { .reg_cache_default = wm8903_reg_defaults, .volatile_register = wm8903_volatile_register, .seq_notifier = wm8903_seq_notifier, + .controls = wm8903_snd_controls, + .num_controls = ARRAY_SIZE(wm8903_snd_controls), .dapm_widgets = wm8903_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8903_dapm_widgets), .dapm_routes = wm8903_intercon,