ASoC: tlv320aic23: Convert to table based control init
authorMark Brown <broonie@linaro.org>
Tue, 24 Sep 2013 17:51:26 +0000 (18:51 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 24 Sep 2013 18:31:17 +0000 (19:31 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/tlv320aic23.c

index 3299459..3a6be8c 100644 (file)
@@ -586,9 +586,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
 
        snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x1);
 
-       snd_soc_add_codec_controls(codec, tlv320aic23_snd_controls,
-                               ARRAY_SIZE(tlv320aic23_snd_controls));
-
        return 0;
 }
 
@@ -607,6 +604,8 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
        .suspend = tlv320aic23_suspend,
        .resume = tlv320aic23_resume,
        .set_bias_level = tlv320aic23_set_bias_level,
+       .controls = tlv320aic23_snd_controls,
+       .num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
        .dapm_widgets = tlv320aic23_dapm_widgets,
        .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
        .dapm_routes = tlv320aic23_intercon,