diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-03-14 04:26:11 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-17 12:53:23 -0400 |
commit | bfe723f6eae285e399615d99f297d1646a6253fe (patch) | |
tree | 5904b786cc74f04662e92afe6f8d2d63609dc70f /sound/soc | |
parent | af12a31f054f55b75c8cf4a459c7bd9d1c7726a9 (diff) |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/sirf-audio-codec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index 90e3a228bae4..58e7c1f23771 100644 --- 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 = { | |||
337 | 337 | ||
338 | static int sirf_audio_codec_probe(struct snd_soc_codec *codec) | 338 | static int sirf_audio_codec_probe(struct snd_soc_codec *codec) |
339 | { | 339 | { |
340 | int ret; | ||
341 | struct snd_soc_dapm_context *dapm = &codec->dapm; | 340 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
342 | struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec); | ||
343 | 341 | ||
344 | pm_runtime_enable(codec->dev); | 342 | pm_runtime_enable(codec->dev); |
345 | codec->control_data = sirf_audio_codec->regmap; | ||
346 | |||
347 | ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); | ||
348 | if (ret != 0) { | ||
349 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
350 | return ret; | ||
351 | } | ||
352 | 343 | ||
353 | if (of_device_is_compatible(codec->dev->of_node, "sirf,prima2-audio-codec")) { | 344 | if (of_device_is_compatible(codec->dev->of_node, "sirf,prima2-audio-codec")) { |
354 | snd_soc_dapm_new_controls(dapm, | 345 | snd_soc_dapm_new_controls(dapm, |