diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-07-29 10:40:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-29 16:29:33 -0400 |
commit | 69331fbdeede932b64a0eaea6d196beaa9c40e0f (patch) | |
tree | 7b77ddc7128b8d26f204d6be3a13a31fe18c2710 /sound/soc/s3c24xx | |
parent | 606689e9f8c52b537c85fd4bc1ba5ce7b3ee2678 (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/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 14 |
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 1358f6fe8201..75ee63db791f 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[] = { | |||
338 | */ | 338 | */ |
339 | static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec) | 339 | static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec) |
340 | { | 340 | { |
341 | int i, err; | 341 | int err; |
342 | 342 | ||
343 | /* set up NC codec pins */ | 343 | /* set up NC codec pins */ |
344 | snd_soc_dapm_nc_pin(codec, "OUT3"); | 344 | snd_soc_dapm_nc_pin(codec, "OUT3"); |
@@ -351,13 +351,11 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec) | |||
351 | ARRAY_SIZE(wm8753_dapm_widgets)); | 351 | ARRAY_SIZE(wm8753_dapm_widgets)); |
352 | 352 | ||
353 | /* add neo1973 gta02 specific controls */ | 353 | /* add neo1973 gta02 specific controls */ |
354 | for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_gta02_controls); i++) { | 354 | err = snd_soc_add_controls(codec, wm8753_neo1973_gta02_controls, |
355 | err = snd_ctl_add(codec->card, | 355 | ARRAY_SIZE(wm8753_neo1973_gta02_controls)); |
356 | snd_soc_cnew(&wm8753_neo1973_gta02_controls[i], | 356 | |
357 | codec, NULL)); | 357 | if (err < 0) |
358 | if (err < 0) | 358 | return err; |
359 | return err; | ||
360 | } | ||
361 | 359 | ||
362 | /* set up neo1973 gta02 specific audio path audio_map */ | 360 | /* set up neo1973 gta02 specific audio path audio_map */ |
363 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 361 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); |