ASoC: ak4671: Convert to table based control init
authorMark Brown <broonie@linaro.org>
Tue, 11 Feb 2014 19:51:58 +0000 (19:51 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 11 Feb 2014 20:40:10 +0000 (20:40 +0000)
Saves code and adds error handling.

Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/ak4671.c

index 25bdf6a..456bd0a 100644 (file)
@@ -628,9 +628,6 @@ static int ak4671_probe(struct snd_soc_codec *codec)
                return ret;
        }
 
-       snd_soc_add_codec_controls(codec, ak4671_snd_controls,
-                            ARRAY_SIZE(ak4671_snd_controls));
-
        ak4671_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
        return ret;
@@ -646,6 +643,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4671 = {
        .probe = ak4671_probe,
        .remove = ak4671_remove,
        .set_bias_level = ak4671_set_bias_level,
+       .controls = ak4671_snd_controls,
+       .num_controls = ARRAY_SIZE(ak4671_snd_controls),
        .reg_cache_size = AK4671_CACHEREGNUM,
        .reg_word_size = sizeof(u8),
        .reg_cache_default = ak4671_reg,