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>

3 files changed, 11 insertions, 35 deletions

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 2137670c9b78..7fa09a387622 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -540,7 +540,6 @@ static int cs4270_probe(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
         struct snd_soc_codec *codec = cs4270_codec;
-        unsigned int i;
         int ret;
 
         /* Connect the codec to the socdev.  snd_soc_new_pcms() needs this. */
@@ -554,23 +553,11 @@ static int cs4270_probe(struct platform_device *pdev)
         }
 
         /* Add the non-DAPM controls */
-        for (i = 0; i < ARRAY_SIZE(cs4270_snd_controls); i++) {
-                struct snd_kcontrol *kctrl;
-
-                kctrl = snd_soc_cnew(&cs4270_snd_controls[i], codec, NULL);
-                if (!kctrl) {
-                        dev_err(codec->dev, "error creating control '%s'\n",
-                               cs4270_snd_controls[i].name);
-                        ret = -ENOMEM;
-                        goto error_free_pcms;
-                }
-
-                ret = snd_ctl_add(codec->card, kctrl);
-                if (ret < 0) {
-                        dev_err(codec->dev, "error adding control '%s'\n",
-                               cs4270_snd_controls[i].name);
-                        goto error_free_pcms;
-                }
+        ret = snd_soc_add_controls(codec, cs4270_snd_controls,
+                                ARRAY_SIZE(cs4270_snd_controls));
+        if (ret < 0) {
+                dev_err(codec->dev, "failed to add controls\n");
+                goto error_free_pcms;
         }
 
         /* And finally, register the socdev */
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index a7f333fc579e..3387d9e736ea 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -324,9 +324,8 @@ static int aic26_probe(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
         struct snd_soc_codec *codec;
-        struct snd_kcontrol *kcontrol;
         struct aic26 *aic26;
-        int i, ret, err;
+        int ret, err;
 
         dev_info(&pdev->dev, "Probing AIC26 SoC CODEC driver\n");
         dev_dbg(&pdev->dev, "socdev=%p\n", socdev);
@@ -353,11 +352,9 @@ static int aic26_probe(struct platform_device *pdev)
 
         /* register controls */
         dev_dbg(&pdev->dev, "Registering controls\n");
-        for (i = 0; i < ARRAY_SIZE(aic26_snd_controls); i++) {
-                kcontrol = snd_soc_cnew(&aic26_snd_controls[i], codec, NULL);
-                err = snd_ctl_add(codec->card, kcontrol);
-                WARN_ON(err < 0);
-        }
+        err = snd_soc_add_controls(codec, aic26_snd_controls,
+                        ARRAY_SIZE(aic26_snd_controls));
+        WARN_ON(err < 0);
 
         /* CODEC is setup, we can register the card now */
         dev_dbg(&pdev->dev, "Registering card\n");
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,
 /* add non dapm controls */
 static int wm8400_add_controls(struct snd_soc_codec *codec)
 {
-        int err, i;
-
-        for (i = 0; i < ARRAY_SIZE(wm8400_snd_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                                snd_soc_cnew(&wm8400_snd_controls[i],codec,
-                                        NULL));
-                if (err < 0)
-                        return err;
-        }
-        return 0;
+        return snd_soc_add_controls(codec, wm8400_snd_controls,
+                                ARRAY_SIZE(wm8400_snd_controls));
 }
 
 /*