ASoC: sgtl5000: Convert to table based DAPM and control init

Convert to table based DAPM and control init.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 04ea4850cd43188eb1c82e4d25db3db790ac0d40..18e61a0be260941f868b8c0277618c2c83f719da 100644 (file)
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -227,7 +227,7 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
 };
 
 /* routes for sgtl5000 */
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = {
        {"Capture Mux", "LINE_IN", "LINE_IN"},  /* line_in --> adc_mux */
        {"Capture Mux", "MIC_IN", "MIC_IN"},    /* mic_in --> adc_mux */
 
@@ -1353,15 +1353,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
        if (ret)
                goto err;
 
-       snd_soc_add_controls(codec, sgtl5000_snd_controls,
-                            ARRAY_SIZE(sgtl5000_snd_controls));
-
-       snd_soc_dapm_new_controls(&codec->dapm, sgtl5000_dapm_widgets,
-                                 ARRAY_SIZE(sgtl5000_dapm_widgets));
-
-       snd_soc_dapm_add_routes(&codec->dapm, audio_map,
-                               ARRAY_SIZE(audio_map));
-
        snd_soc_dapm_new_widgets(&codec->dapm);
 
        return 0;
@@ -1402,6 +1393,12 @@ static struct snd_soc_codec_driver sgtl5000_driver = {
        .reg_cache_step = 2,
        .reg_cache_default = sgtl5000_regs,
        .volatile_register = sgtl5000_volatile_register,
+       .controls = sgtl5000_snd_controls,
+       .num_controls = ARRAY_SIZE(sgtl5000_snd_controls),
+       .dapm_widgets = sgtl500_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(sgtl500_dapm_widgets),
+       .dapm_routes = sgtl500_dapm_routes,
+       .num_dapm_routes = ARRAY_SIZE(sgtl500_dapm_routes),
 };
 
 static __devinit int sgtl5000_i2c_probe(struct i2c_client *client,