From 20f89b92f36ef3dbe535dff0adf2ea19f4094360 Mon Sep 17 00:00:00 2001
From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 28 Jun 2009 21:05:35 +0000
Subject: [s3c24xx] gta02_wm8753: Use snd_soc_add_controls to add machine
specific controls.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16613 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c b/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
index 4abb18a14..1f8f9db9b 100644
--- a/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
+++ b/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
@@ -338,7 +338,7 @@ static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
*/
static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
{
- int i, err;
+ int err;
/* set up NC codec pins */
snd_soc_dapm_nc_pin(codec, "OUT3");
@@ -351,13 +351,11 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
ARRAY_SIZE(wm8753_dapm_widgets));
/* add neo1973 gta02 specific controls */
- for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_gta02_controls); i++) {
- err = snd_ctl_add(codec->card,
- snd_soc_cnew(&wm8753_neo1973_gta02_controls[i],
- codec, NULL));
- if (err < 0)
- return err;
- }
+ err = snd_soc_add_controls(codec, wm8753_neo1973_gta02_controls,
+ ARRAY_SIZE(wm8753_neo1973_gta02_controls));
+
+ if (err < 0)
+ return err;
/* set up neo1973 gta02 specific audio path audio_map */
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
--
cgit v1.2.3