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

Commit 964eafb1 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: wm8997: Remove the set_cache_io() entirely from ASoC probe. 



As we can set the CODEC I/O while snd_soc_register_codec(), so the
calling of set_cache_io() from CODEC ASoC probe could be removed
entirely.

And then we can set the CODEC I/O in the device probe instead of
CODEC ASoC probe as earily as possible.

Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c0b6f59b

sound/soc/codecs/wm8997.c

+8 −5
Original line number Diff line number Diff line
@@ -1051,11 +1051,6 @@ static struct snd_soc_dai_driver wm8997_dai[] = { 
static int wm8997_codec_probe(struct snd_soc_codec *codec)

{

	struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap);

	if (ret != 0)

		return ret;



	arizona_init_spk(codec);
@@ -1086,9 +1081,17 @@ static unsigned int wm8997_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_5R,

};



struct regmap *wm8997_get_regmap(struct device *dev)

{

	struct wm8997_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8997 = {

	.probe = wm8997_codec_probe,

	.remove = wm8997_codec_remove,

	.get_regmap =   wm8997_get_regmap,



	.idle_bias_off = true,