Skip to content

Commit

Permalink
ASoC: sirf-audio-codec: Remove snd_soc_codec_set_cache_io() call
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Mar 17, 2014
1 parent af12a31 commit bfe723f
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions sound/soc/codecs/sirf-audio-codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit bfe723f

Please sign in to comment.