aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-07-29 16:40:18 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-29 21:29:33 +0100
commit69331fbdeede932b64a0eaea6d196beaa9c40e0f (patch)
tree7b77ddc7128b8d26f204d6be3a13a31fe18c2710 /sound
parent606689e9f8c52b537c85fd4bc1ba5ce7b3ee2678 (diff)
ASoC: neo1973_gta02_wm8753: Replace snd_soc_cnew with snd_soc_add_controls.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/s3c24xx/neo1973_gta02_wm8753.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index 1358f6fe820..75ee63db791 100644
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_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));