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

Commit 6e4842d3 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: wm5110: 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 c8b02acd

sound/soc/codecs/wm5110.c

+8 −4
Original line number Diff line number Diff line
@@ -1589,10 +1589,6 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) 


	priv->core.arizona->dapm = &codec->dapm;



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

	if (ret != 0)

		return ret;



	arizona_init_spk(codec);

	arizona_init_gpio(codec);
@@ -1633,9 +1629,17 @@ static unsigned int wm5110_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_6R,

};



struct regmap *wm5110_get_regmap(struct device *dev)

{

	struct wm5110_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static struct snd_soc_codec_driver soc_codec_dev_wm5110 = {

	.probe = wm5110_codec_probe,

	.remove = wm5110_codec_remove,

	.get_regmap = wm5110_get_regmap,



	.idle_bias_off = true,