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

Commit 85362efb authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: ssm2602: Cleanup manual bias level transitions 



Set the CODEC driver's suspend_bias_off flag rather than manually going to
SND_SOC_BIAS_OFF in suspend and SND_SOC_BIAS_STANDBY in resume. This makes
the code a bit shorter and cleaner. While we are at it also remove the
regcache_cache_only() calls from suspend/resume as there shouldn't be any IO
between suspend and resume.

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.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f0cc5a7

sound/soc/codecs/ssm2602.c

+2 −22
Original line number Diff line number Diff line
@@ -502,18 +502,11 @@ static struct snd_soc_dai_driver ssm2602_dai = { 
	.symmetric_samplebits = 1,

};



static int ssm2602_suspend(struct snd_soc_codec *codec)

{

	ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int ssm2602_resume(struct snd_soc_codec *codec)

{

	struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);



	regcache_sync(ssm2602->regmap);

	ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}
@@ -586,27 +579,14 @@ static int ssm260x_codec_probe(struct snd_soc_codec *codec) 
		break;

	}



	if (ret)

	return ret;



	ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;

}



/* remove everything here */

static int ssm2602_remove(struct snd_soc_codec *codec)

{

	ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = {

	.probe =	ssm260x_codec_probe,

	.remove =	ssm2602_remove,

	.suspend =	ssm2602_suspend,

	.resume =	ssm2602_resume,

	.set_bias_level = ssm2602_set_bias_level,

	.suspend_bias_off = true,



	.controls = ssm260x_snd_controls,

	.num_controls = ARRAY_SIZE(ssm260x_snd_controls),