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/corgi.c b/sound/soc/pxa/corgi.c
index 146973ae0974..02263e5d8f03 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -276,18 +276,16 @@ static const struct snd_kcontrol_new wm8731_corgi_controls[] = {
  */
 static int corgi_wm8731_init(struct snd_soc_codec *codec)
 {
-        int i, err;
+        int err;
 
         snd_soc_dapm_nc_pin(codec, "LLINEIN");
         snd_soc_dapm_nc_pin(codec, "RLINEIN");
 
         /* Add corgi specific controls */
-        for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                        snd_soc_cnew(&wm8731_corgi_controls[i], codec, NULL));
-                if (err < 0)
-                        return err;
-        }
+        err = snd_soc_add_controls(codec, wm8731_corgi_controls,
+                                ARRAY_SIZE(wm8731_corgi_controls));
+        if (err < 0)
+                return err;
 
         /* Add corgi specific widgets */
         snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets,