diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2009-03-12 06:07:54 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-12 11:43:30 -0400 |
commit | eb5f6d753e337834c7ceb07824ee472e43d9a7a2 (patch) | |
tree | 22c549607a8ed5657c98af6ae4ead1b3c0eaaaec /sound/soc/codecs/wm8400.c | |
parent | 6f7cb44ba1a5195bf719f9ba1d57bd79e13262c1 (diff) |
ASoC: Replace remaining uses of snd_soc_cnew with snd_soc_add_controls.
The drivers are basically duplicating the same code over and over.
As snd_soc_cnew is going to be made static some time after the next
merge window, we might as well convert them now.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8400.c')
-rw-r--r-- | sound/soc/codecs/wm8400.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 4e1cefff8483..744e0dc73be4 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -351,16 +351,8 @@ SOC_SINGLE("RIN34 Mute Switch", WM8400_RIGHT_LINE_INPUT_3_4_VOLUME, | |||
351 | /* add non dapm controls */ | 351 | /* add non dapm controls */ |
352 | static int wm8400_add_controls(struct snd_soc_codec *codec) | 352 | static int wm8400_add_controls(struct snd_soc_codec *codec) |
353 | { | 353 | { |
354 | int err, i; | 354 | return snd_soc_add_controls(codec, wm8400_snd_controls, |
355 | 355 | ARRAY_SIZE(wm8400_snd_controls)); | |
356 | for (i = 0; i < ARRAY_SIZE(wm8400_snd_controls); i++) { | ||
357 | err = snd_ctl_add(codec->card, | ||
358 | snd_soc_cnew(&wm8400_snd_controls[i],codec, | ||
359 | NULL)); | ||
360 | if (err < 0) | ||
361 | return err; | ||
362 | } | ||
363 | return 0; | ||
364 | } | 356 | } |
365 | 357 | ||
366 | /* | 358 | /* |