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

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

ASoC: wm8350: 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 6e4842d3

sound/soc/codecs/wm8350.c

+8 −2
Original line number Diff line number Diff line
@@ -1505,8 +1505,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
	if (ret != 0)

		return ret;



	snd_soc_codec_set_cache_io(codec, wm8350->regmap);



	/* Put the codec into reset if it wasn't already */

	wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
@@ -1608,11 +1606,19 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) 
	return 0;

}



struct regmap *wm8350_get_regmap(struct device *dev)

{

	struct wm8350 *wm8350 = dev_get_platdata(dev);



	return wm8350->regmap;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {

	.probe =	wm8350_codec_probe,

	.remove =	wm8350_codec_remove,

	.suspend = 	wm8350_suspend,

	.resume =	wm8350_resume,

	.get_regmap =	wm8350_get_regmap,

	.set_bias_level = wm8350_set_bias_level,



	.controls = wm8350_snd_controls,