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>

1 files changed, 5 insertions, 7 deletions

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 09b5bada03b9..fc781374b1bf 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -188,18 +188,16 @@ static const struct snd_kcontrol_new tosa_controls[] = {
 
 static int tosa_ac97_init(struct snd_soc_codec *codec)
 {
-        int i, err;
+        int err;
 
         snd_soc_dapm_nc_pin(codec, "OUT3");
         snd_soc_dapm_nc_pin(codec, "MONOOUT");
 
         /* add tosa specific controls */
-        for (i = 0; i < ARRAY_SIZE(tosa_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                                snd_soc_cnew(&tosa_controls[i],codec, NULL));
-                if (err < 0)
-                        return err;
-        }
+        err = snd_soc_add_controls(codec, tosa_controls,
+                                ARRAY_SIZE(tosa_controls));
+        if (err < 0)
+                return err;
 
         /* add tosa specific widgets */
         snd_soc_dapm_new_controls(codec, tosa_dapm_widgets,