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

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

ASoC: si476x: 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 avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d957f165

sound/soc/codecs/si476x.c

+6 −8
Original line number Diff line number Diff line
@@ -208,13 +208,6 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream, 
	return err;

}



static int si476x_codec_probe(struct snd_soc_codec *codec)

{

	struct regmap *regmap = dev_get_regmap(codec->dev->parent, NULL);



	return snd_soc_codec_set_cache_io(codec, regmap);

}



static struct snd_soc_dai_ops si476x_dai_ops = {

	.hw_params	= si476x_codec_hw_params,

	.set_fmt	= si476x_codec_set_dai_fmt,
@@ -238,8 +231,13 @@ static struct snd_soc_dai_driver si476x_dai = { 
	.ops		= &si476x_dai_ops,

};



struct regmap *si476x_get_regmap(struct device *dev)

{

	return dev_get_regmap(dev->parent, NULL);

}



static struct snd_soc_codec_driver soc_codec_dev_si476x = {

	.probe  = si476x_codec_probe,

	.get_regmap = si476x_get_regmap,

	.dapm_widgets = si476x_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets),

	.dapm_routes = si476x_dapm_routes,