ASoC: tlv320aic31xx: Remove snd_soc_codec_set_cache_io() call
diff mbox

Message ID 1394727755-7091-1-git-send-email-jsarha@ti.com
State Accepted
Commit bc236fa7301c6ca0ccf5470a964842d1a60e786f
Headers show

Commit Message

Jyri Sarha March 13, 2014, 4:22 p.m. UTC
Remove snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP) call
and codec->control_data = aic31xx->regmap assignment since that
already done by core.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
---
This patch should fix the last minute breakkage of v3.15 ASoC updates build.

 sound/soc/codecs/tlv320aic31xx.c |    9 ---------
 1 file changed, 9 deletions(-)

Comments

Mark Brown March 13, 2014, 5:32 p.m. UTC | #1
On Thu, Mar 13, 2014 at 06:22:35PM +0200, Jyri Sarha wrote:
> Remove snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP) call
> and codec->control_data = aic31xx->regmap assignment since that
> already done by core.

Applied, thanks.

Patch
diff mbox

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index c9f6989..625b184 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1051,18 +1051,9 @@  static int aic31xx_codec_probe(struct snd_soc_codec *codec)
 	dev_dbg(aic31xx->dev, "## %s\n", __func__);
 
 	aic31xx = snd_soc_codec_get_drvdata(codec);
-	codec->control_data = aic31xx->regmap;
 
 	aic31xx->codec = codec;
 
-	ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
-
-	if (ret != 0) {
-		dev_err(codec->dev, "snd_soc_codec_set_cache_io failed %d\n",
-			ret);
-		return ret;
-	}
-
 	for (i = 0; i < ARRAY_SIZE(aic31xx->supplies); i++) {
 		aic31xx->disable_nb[i].nb.notifier_call =
 			aic31xx_regulator_event;