aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-10-30 16:01:00 -0400
committerMark Brown <broonie@kernel.org>2014-10-31 13:18:50 -0400
commit6ce13d61dc6cfc3cf6be6bd12faf75bfbc12ea91 (patch)
tree02bd8797fbf55f358c86fa8dbae239d59521fc5c /sound/soc/codecs
parente5adb6cddb17f8e76be404f23a2e0db102ee1bd1 (diff)
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>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/ad1980.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 5f076c24d062..9ed4e12c26d1 100644
--- 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)
259 ext_status = ac97_read(codec, AC97_EXTENDED_STATUS); 259 ext_status = ac97_read(codec, AC97_EXTENDED_STATUS);
260 ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800); 260 ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);
261 261
262 snd_soc_add_codec_controls(codec, ad1980_snd_ac97_controls,
263 ARRAY_SIZE(ad1980_snd_ac97_controls));
264
265 return 0; 262 return 0;
266 263
267reset_err: 264reset_err:
@@ -285,6 +282,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1980 = {
285 .write = ac97_write, 282 .write = ac97_write,
286 .read = ac97_read, 283 .read = ac97_read,
287 284
285 .controls = ad1980_snd_ac97_controls,
286 .num_controls = ARRAY_SIZE(ad1980_snd_ac97_controls),
288 .dapm_widgets = ad1980_dapm_widgets, 287 .dapm_widgets = ad1980_dapm_widgets,
289 .num_dapm_widgets = ARRAY_SIZE(ad1980_dapm_widgets), 288 .num_dapm_widgets = ARRAY_SIZE(ad1980_dapm_widgets),
290 .dapm_routes = ad1980_dapm_routes, 289 .dapm_routes = ad1980_dapm_routes,