ASoC: Convert wm8971 to table based DAPM and control init

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

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index a1db150..3a5d67c 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -252,7 +252,7 @@ static const struct snd_soc_dapm_widget wm8971_dapm_widgets[] = {
        SND_SOC_DAPM_INPUT("MIC"),
 };
 
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route wm8971_dapm_routes[] = {
        /* left mixer */
        {"Left Mixer", "Playback Switch", "Left DAC"},
        {"Left Mixer", "Left Bypass Switch", "Left Line Mux"},
@@ -329,17 +329,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
        {"Right ADC", NULL, "Right ADC Mux"},
 };
 
-static int wm8971_add_widgets(struct snd_soc_codec *codec)
-{
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       snd_soc_dapm_new_controls(dapm, wm8971_dapm_widgets,
-                                 ARRAY_SIZE(wm8971_dapm_widgets));
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-       return 0;
-}
-
 struct _coeff_div {
        u32 mclk;
        u32 rate;
@@ -659,10 +648,6 @@ static int wm8971_probe(struct snd_soc_codec *codec)
        snd_soc_update_bits(codec, WM8971_LINVOL, 0x0100, 0x0100);
        snd_soc_update_bits(codec, WM8971_RINVOL, 0x0100, 0x0100);
 
-       snd_soc_add_controls(codec, wm8971_snd_controls,
-                               ARRAY_SIZE(wm8971_snd_controls));
-       wm8971_add_widgets(codec);
-
        return ret;
 }
 
@@ -686,6 +671,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = {
        .reg_cache_size = ARRAY_SIZE(wm8971_reg),
        .reg_word_size = sizeof(u16),
        .reg_cache_default = wm8971_reg,
+
+       .controls = wm8971_snd_controls,
+       .num_controls = ARRAY_SIZE(wm8971_snd_controls),
+       .dapm_widgets = wm8971_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(wm8971_dapm_widgets),
+       .dapm_routes = wm8971_dapm_routes,
+       .num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes),
 };
 
 static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,