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

ASoC: mc13783: 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>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 49101a25

sound/soc/codecs/mc13783.c

+6 −8
Original line number Diff line number Diff line
@@ -608,14 +608,6 @@ static struct snd_kcontrol_new mc13783_control_list[] = { 
static int mc13783_probe(struct snd_soc_codec *codec)

{

	struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = snd_soc_codec_set_cache_io(codec,

			dev_get_regmap(codec->dev->parent, NULL));

	if (ret != 0) {

		dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);

		return ret;

	}



	/* these are the reset values */

	mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893);
@@ -735,9 +727,15 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = { 
	}

};



struct regmap *mc13783_get_regmap(struct device *dev)

{

	return dev_get_regmap(dev->parent, NULL);

}



static struct snd_soc_codec_driver soc_codec_dev_mc13783 = {

	.probe		= mc13783_probe,

	.remove		= mc13783_remove,

	.get_regmap	= mc13783_get_regmap,

	.controls	= mc13783_control_list,

	.num_controls	= ARRAY_SIZE(mc13783_control_list),

	.dapm_widgets	= mc13783_dapm_widgets,

CRA Git | Maintained and supported by SUSTech CRA and CCSE