ASoC: Convert WM8728 to table based control init
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 3 Dec 2011 11:49:02 +0000 (11:49 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 3 Dec 2011 21:35:18 +0000 (21:35 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8728.c

index b1f01d9..fc3d59e 100644 (file)
@@ -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,