ASoC: ad1980: Use table based control setup

Makes the code a bit cleaner.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 5f076c24d0622ab541b11bc73933070bd9189302..9ed4e12c26d1c217dc7c3923a73aa98e73a0f102 100644 (file)
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -259,9 +259,6 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
        ext_status = ac97_read(codec, AC97_EXTENDED_STATUS);
        ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
 
-       snd_soc_add_codec_controls(codec, ad1980_snd_ac97_controls,
-                               ARRAY_SIZE(ad1980_snd_ac97_controls));
-
        return 0;
 
 reset_err:
@@ -285,6 +282,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1980 = {
        .write = ac97_write,
        .read = ac97_read,
 
+       .controls = ad1980_snd_ac97_controls,
+       .num_controls = ARRAY_SIZE(ad1980_snd_ac97_controls),
        .dapm_widgets = ad1980_dapm_widgets,
        .num_dapm_widgets = ARRAY_SIZE(ad1980_dapm_widgets),
        .dapm_routes = ad1980_dapm_routes,