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

Commit 4504bade authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: wm8400: 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 aec0eb50

sound/soc/codecs/wm8400.c

+8 −2
Original line number Diff line number Diff line
@@ -1318,8 +1318,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) 
	priv->wm8400 = wm8400;

	priv->codec = codec;



	snd_soc_codec_set_cache_io(codec, wm8400->regmap);



	ret = devm_regulator_bulk_get(wm8400->dev,

				 ARRAY_SIZE(power), &power[0]);

	if (ret != 0) {
@@ -1361,11 +1359,19 @@ static int wm8400_codec_remove(struct snd_soc_codec *codec) 
	return 0;

}



struct regmap *wm8400_get_regmap(struct device *dev)

{

	struct wm8400 *wm8400 = dev_get_platdata(dev);



	return wm8400->regmap;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8400 = {

	.probe =	wm8400_codec_probe,

	.remove =	wm8400_codec_remove,

	.suspend =	wm8400_suspend,

	.resume =	wm8400_resume,

	.get_regmap =	wm8400_get_regmap,

	.set_bias_level = wm8400_set_bias_level,



	.controls = wm8400_snd_controls,