ASoC: Convert WM8804 to table based control init

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index ae4b8fb3c3e5da4c22cbcb46e68c8b22b34b9fc6..d54a3ca5e19ee3c72550f464e0032d1caeca0bc3 100644 (file)
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -659,8 +659,6 @@ static int wm8804_probe(struct snd_soc_codec *codec)
 
        wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-       snd_soc_add_controls(codec, wm8804_snd_controls,
-                            ARRAY_SIZE(wm8804_snd_controls));
        return 0;
 
 err_reg_enable:
@@ -715,7 +713,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
        .reg_cache_size = ARRAY_SIZE(wm8804_reg_defs),
        .reg_word_size = sizeof(u8),
        .reg_cache_default = wm8804_reg_defs,
-       .volatile_register = wm8804_volatile
+       .volatile_register = wm8804_volatile,
+
+       .controls = wm8804_snd_controls,
+       .num_controls = ARRAY_SIZE(wm8804_snd_controls),
 };
 
 static const struct of_device_id wm8804_of_match[] = {