ASoC: sn95031: Use table based control setup

Makes the code a bit cleaner.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index cf8fa40662f045dc30f8c057b7b3a93604ec99f4..6167c5996d8ee0593768acbb7fb44cbe7a7336fc 100644 (file)
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -867,9 +867,6 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
        snd_soc_write(codec, SN95031_SSR2, 0x10);
        snd_soc_write(codec, SN95031_SSR3, 0x40);
 
-       snd_soc_add_codec_controls(codec, sn95031_snd_controls,
-                            ARRAY_SIZE(sn95031_snd_controls));
-
        return 0;
 }
 
@@ -886,6 +883,9 @@ static struct snd_soc_codec_driver sn95031_codec = {
        .remove         = sn95031_codec_remove,
        .set_bias_level = sn95031_set_vaud_bias,
        .idle_bias_off  = true,
+
+       .controls       = sn95031_snd_controls,
+       .num_controls   = ARRAY_SIZE(sn95031_snd_controls),
        .dapm_widgets   = sn95031_dapm_widgets,
        .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
        .dapm_routes    = sn95031_audio_map,