aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/sn95031.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-05 04:46:31 -0500
committerMark Brown <broonie@kernel.org>2014-11-05 09:47:40 -0500
commit0c239fa6ebd20dd55d8978502d78b7c17441351a (patch)
tree518d06a0bb7243b51d826407933c86ad55c71e65 /sound/soc/codecs/sn95031.c
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
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>
Diffstat (limited to 'sound/soc/codecs/sn95031.c')
-rw-r--r--sound/soc/codecs/sn95031.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index cf8fa40662f0..6167c5996d8e 100644
--- 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)
867 snd_soc_write(codec, SN95031_SSR2, 0x10); 867 snd_soc_write(codec, SN95031_SSR2, 0x10);
868 snd_soc_write(codec, SN95031_SSR3, 0x40); 868 snd_soc_write(codec, SN95031_SSR3, 0x40);
869 869
870 snd_soc_add_codec_controls(codec, sn95031_snd_controls,
871 ARRAY_SIZE(sn95031_snd_controls));
872
873 return 0; 870 return 0;
874} 871}
875 872
@@ -886,6 +883,9 @@ static struct snd_soc_codec_driver sn95031_codec = {
886 .remove = sn95031_codec_remove, 883 .remove = sn95031_codec_remove,
887 .set_bias_level = sn95031_set_vaud_bias, 884 .set_bias_level = sn95031_set_vaud_bias,
888 .idle_bias_off = true, 885 .idle_bias_off = true,
886
887 .controls = sn95031_snd_controls,
888 .num_controls = ARRAY_SIZE(sn95031_snd_controls),
889 .dapm_widgets = sn95031_dapm_widgets, 889 .dapm_widgets = sn95031_dapm_widgets,
890 .num_dapm_widgets = ARRAY_SIZE(sn95031_dapm_widgets), 890 .num_dapm_widgets = ARRAY_SIZE(sn95031_dapm_widgets),
891 .dapm_routes = sn95031_audio_map, 891 .dapm_routes = sn95031_audio_map,