ASoC: Convert WM9081 to table based control init

At least for the core controls, the optionally selected controls are still
added programatically.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index b2d3448..2b6a75c 100644 (file)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1248,8 +1248,6 @@ static int wm9081_probe(struct snd_soc_codec *codec)
        snd_soc_write(codec, WM9081_ANALOGUE_SPEAKER_PGA,
                     reg | WM9081_SPKPGAZC);
 
-       snd_soc_add_controls(codec, wm9081_snd_controls,
-                            ARRAY_SIZE(wm9081_snd_controls));
        if (!wm9081->pdata.num_retune_configs) {
                dev_dbg(codec->dev,
                        "No ReTune Mobile data, using normal EQ\n");
@@ -1309,6 +1307,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
        .reg_cache_default = wm9081_reg_defaults,
        .volatile_register = wm9081_volatile_register,
 
+       .controls         = wm9081_snd_controls,
+       .num_controls     = ARRAY_SIZE(wm9081_snd_controls),
        .dapm_widgets     = wm9081_dapm_widgets,
        .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets),
        .dapm_routes     = wm9081_audio_paths,