Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfe723f6 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent af12a31f

sound/soc/codecs/sirf-audio-codec.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -337,18 +337,9 @@ struct snd_soc_dai_driver sirf_audio_codec_dai = { 




static int sirf_audio_codec_probe(struct snd_soc_codec *codec)

static int sirf_audio_codec_probe(struct snd_soc_codec *codec)

{

{

	int ret;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	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);

	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")) {

	if (of_device_is_compatible(codec->dev->of_node, "sirf,prima2-audio-codec")) {

		snd_soc_dapm_new_controls(dapm,

		snd_soc_dapm_new_controls(dapm,