ASoC: cs4271: Convert to table based control init
authorMark Brown <broonie@linaro.org>
Sun, 11 Aug 2013 12:12:13 +0000 (13:12 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 11 Aug 2013 13:04:19 +0000 (14:04 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
sound/soc/codecs/cs4271.c

index 03036b326732ddfec0fad5b390806d9000a58589..65ad56c43c133c55a8f377da374cc88b2ce639bd 100644 (file)
@@ -576,8 +576,7 @@ static int cs4271_probe(struct snd_soc_codec *codec)
                                   CS4271_MODE2_MUTECAEQUB,
                                   CS4271_MODE2_MUTECAEQUB);
 
-       return snd_soc_add_codec_controls(codec, cs4271_snd_controls,
-               ARRAY_SIZE(cs4271_snd_controls));
+       return 0;
 }
 
 static int cs4271_remove(struct snd_soc_codec *codec)
@@ -596,6 +595,9 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = {
        .remove                 = cs4271_remove,
        .suspend                = cs4271_soc_suspend,
        .resume                 = cs4271_soc_resume,
+
+       .controls               = cs4271_snd_controls,
+       .num_controls           = ARRAY_SIZE(cs4271_snd_controls),
 };
 
 #if defined(CONFIG_SPI_MASTER)