diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-10-30 16:01:08 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-31 13:33:58 -0400 |
commit | c1359ca303ee5125827c0d2a65f0c86d491dc993 (patch) | |
tree | 9a80a6cff04fe29de26e0947ff2749a33641cf81 /sound/soc/codecs/wm9713.c | |
parent | a6c2b07f11beaf5719f03c70a9c9597534b297a5 (diff) |
ASoC: wm9713: Use table based control setup
Makes the code a bit cleaner.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm9713.c')
-rw-r--r-- | sound/soc/codecs/wm9713.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 38e17d45cfef..ba8c276b9dcf 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -1216,9 +1216,6 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) | |||
1216 | reg = ac97_read(codec, AC97_CD) & 0x7fff; | 1216 | reg = ac97_read(codec, AC97_CD) & 0x7fff; |
1217 | ac97_write(codec, AC97_CD, reg); | 1217 | ac97_write(codec, AC97_CD, reg); |
1218 | 1218 | ||
1219 | snd_soc_add_codec_controls(codec, wm9713_snd_ac97_controls, | ||
1220 | ARRAY_SIZE(wm9713_snd_ac97_controls)); | ||
1221 | |||
1222 | return 0; | 1219 | return 0; |
1223 | 1220 | ||
1224 | reset_err: | 1221 | reset_err: |
@@ -1248,6 +1245,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { | |||
1248 | .reg_word_size = sizeof(u16), | 1245 | .reg_word_size = sizeof(u16), |
1249 | .reg_cache_step = 2, | 1246 | .reg_cache_step = 2, |
1250 | .reg_cache_default = wm9713_reg, | 1247 | .reg_cache_default = wm9713_reg, |
1248 | |||
1249 | .controls = wm9713_snd_ac97_controls, | ||
1250 | .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls), | ||
1251 | .dapm_widgets = wm9713_dapm_widgets, | 1251 | .dapm_widgets = wm9713_dapm_widgets, |
1252 | .num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets), | 1252 | .num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets), |
1253 | .dapm_routes = wm9713_audio_map, | 1253 | .dapm_routes = wm9713_audio_map, |