summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs4271.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-11 14:12:13 +0200
committerMark Brown <broonie@linaro.org>2013-08-11 15:04:19 +0200
commitbad268f3504e2a58e406c3f0e282c1de629bd42f (patch)
tree8622a595192fc6e6d24a234e19cefaafe0300677 /sound/soc/codecs/cs4271.c
parentLinux 3.11-rc4 (diff)
downloadlinux-bad268f3504e2a58e406c3f0e282c1de629bd42f.tar.xz
linux-bad268f3504e2a58e406c3f0e282c1de629bd42f.zip
ASoC: cs4271: Convert to table based control init
Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
Diffstat (limited to 'sound/soc/codecs/cs4271.c')
-rw-r--r--sound/soc/codecs/cs4271.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 03036b326732..65ad56c43c13 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -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)