Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / wm8985.c

diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index d786f2b39764a92d49b937884db97b6c408546a0..5473dc969585de3852feb6cbbdca7d09b4ace49f 100644 (file)
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -995,13 +995,6 @@ static int wm8985_probe(struct snd_soc_codec *codec)
        int ret;
 
        wm8985 = snd_soc_codec_get_drvdata(codec);
-       codec->control_data = wm8985->regmap;
-
-       ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
-       if (ret < 0) {
-               dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret);
-               return ret;
-       }
 
        for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++)
                wm8985->supplies[i].supply = wm8985_supply_names[i];