ASoC: Convert WM8731 to table based DAPM setup

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

1 files changed, 5 insertions, 13 deletions

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 0a67c31b2663..44a591e82558 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -201,7 +201,7 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
         return wm8731->sysclk_type == WM8731_SYSCLK_MCLK;
 }
 
-static const struct snd_soc_dapm_route intercon[] = {
+static const struct snd_soc_dapm_route wm8731_intercon[] = {
         {"DAC", NULL, "OSC", wm8731_check_osc},
         {"ADC", NULL, "OSC", wm8731_check_osc},
 
@@ -227,17 +227,6 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Mic Bias", NULL, "MICIN"},
 };
 
-static int wm8731_add_widgets(struct snd_soc_codec *codec)
-{
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_new_controls(dapm, wm8731_dapm_widgets,
-                                  ARRAY_SIZE(wm8731_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
-
-        return 0;
-}
-
 struct _coeff_div {
         u32 mclk;
         u32 rate;
@@ -599,7 +588,6 @@ static int wm8731_probe(struct snd_soc_codec *codec)
 
         snd_soc_add_controls(codec, wm8731_snd_controls,
                              ARRAY_SIZE(wm8731_snd_controls));
-        wm8731_add_widgets(codec);
 
         /* Regulators will have been enabled by bias management */
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
@@ -636,6 +624,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
         .reg_cache_size = ARRAY_SIZE(wm8731_reg),
         .reg_word_size = sizeof(u16),
         .reg_cache_default = wm8731_reg,
+        .dapm_widgets = wm8731_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
+        .dapm_routes = wm8731_intercon,
+        .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
 };
 
 #if defined(CONFIG_SPI_MASTER)