ASoC: sirf-audio-codec: Remove snd_soc_codec_set_cache_io() call

There was a overlap between the snd_soc_codec_set_cache_io() cleanup and the
addition of the sirf-audio-codec resulting in the sirf-audio-codec driver still
using the old signature of snd_soc_codec_set_cache_io(), which will cause a
compile error. Since the core is able to automatically setup IO for this driver
we can just remove both the snd_soc_set_cache_io() call and the control_data
assignment.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c
index 90e3a228bae4e5c7d8816c95d8590e1eab559925..58e7c1f23771463a04bb38116017891c1b633b81 100644 (file)
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@ -337,18 +337,9 @@ struct snd_soc_dai_driver sirf_audio_codec_dai = {
 
 static int sirf_audio_codec_probe(struct snd_soc_codec *codec)
 {
-       int ret;
        struct snd_soc_dapm_context *dapm = &codec->dapm;
-       struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec);
 
        pm_runtime_enable(codec->dev);
-       codec->control_data = sirf_audio_codec->regmap;
-
-       ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
-       if (ret != 0) {
-               dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-               return ret;
-       }
 
        if (of_device_is_compatible(codec->dev->of_node, "sirf,prima2-audio-codec")) {
                snd_soc_dapm_new_controls(dapm,