summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/rt5631.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-13 14:19:21 +0000
committerMark Brown <broonie@linaro.org>2014-03-13 14:19:21 +0000
commit2620954d64f6f067b785faf03738b637f3473ca7 (patch)
tree00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/rt5631.c
parent8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff)
parenta32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff)
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/rt5631.c')
-rw-r--r--sound/soc/codecs/rt5631.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index ce199d375209..d4c229f0233f 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1570,15 +1570,6 @@ static int rt5631_probe(struct snd_soc_codec *codec)
{
struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec);
unsigned int val;
- int ret;
-
- codec->control_data = rt5631->regmap;
-
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);
- if (ret != 0) {
- dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
- return ret;
- }
val = rt5631_read_index(codec, RT5631_ADDA_MIXER_INTL_REG3);
if (val & 0x0002)