ASoC: cleanup duplicated code.

Many codec drivers were implementing cookie-cutter copies of the function
that adds kcontrols to the codec.

This patch moves this code to a common function snd_soc_add_controls() in
soc-core.c and updates all drivers using copies of this function to use the
new common version.

[Edited to raise priority of error log message and document parameters.
 -- broonie]

Signed-off-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 5997fa68e0d5..1578569793a2 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -231,21 +231,6 @@ SOC_SINGLE("Mono Playback Volume", WM8750_MOUTV, 0, 127, 0),
 
 };
 
-/* add non dapm controls */
-static int wm8750_add_controls(struct snd_soc_codec *codec)
-{
-        int err, i;
-
-        for (i = 0; i < ARRAY_SIZE(wm8750_snd_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                                snd_soc_cnew(&wm8750_snd_controls[i],
-                                                codec, NULL));
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-
 /*
  * DAPM Controls
  */
@@ -816,7 +801,8 @@ static int wm8750_init(struct snd_soc_device *socdev)
         reg = wm8750_read_reg_cache(codec, WM8750_RINVOL);
         wm8750_write(codec, WM8750_RINVOL, reg | 0x0100);
 
-        wm8750_add_controls(codec);
+        snd_soc_add_controls(codec, wm8750_snd_controls,
+                                ARRAY_SIZE(wm8750_snd_controls));
         wm8750_add_widgets(codec);
         ret = snd_soc_init_card(socdev);
         if (ret < 0) {