ASoC: cq93vc: Cleanup manual bias level transitions (6200b75a) · Commits · 戴 / test

Remove the manual transition back to SND_SOC_BIAS_STANDBY in resume. This is already be automatically handled by the ASoC core. Since the ASoC core now takes care of setting the bias level to SND_SOC_BIAS_OFF when removing the CODEC there is no need to do it manually anymore either. The manual transition to SND_SOC_BIAS_STANDBY at the end of CODEC probe() can also be removed as the core will automatically do this after the CODEC has been probed. While we are at it also remove the unused codec field from the cq93vc struct so the whole probe function can be removed. Signed-off-by:

Lars-Peter Clausen <lars@metafoo.de> Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/codecs/cq93vc.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -122,28 +122,6 @@ static struct snd_soc_dai_driver cq93vc_dai = {
		.ops = &cq93vc_dai_ops,
		};

		static int cq93vc_resume(struct snd_soc_codec *codec)
		{
		cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

		return 0;
		}

		static int cq93vc_probe(struct snd_soc_codec *codec)
		{
		/* Off, with power on */
		cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

		return 0;
		}

		static int cq93vc_remove(struct snd_soc_codec *codec)
		{
		cq93vc_set_bias_level(codec, SND_SOC_BIAS_OFF);

		return 0;
		}

		static struct regmap cq93vc_get_regmap(struct device dev)
		{
		struct davinci_vc *davinci_vc = dev->platform_data;
		@@ -153,9 +131,6 @@ static struct regmap cq93vc_get_regmap(struct device dev)

		static struct snd_soc_codec_driver soc_codec_dev_cq93vc = {
		.set_bias_level = cq93vc_set_bias_level,
		.probe = cq93vc_probe,
		.remove = cq93vc_remove,
		.resume = cq93vc_resume,
		.get_regmap = cq93vc_get_regmap,
		.controls = cq93vc_snd_controls,
		.num_controls = ARRAY_SIZE(cq93vc_snd_controls),

Admin message