leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: adau17x1: Cleanup manual bias level transitions

Browse Source 
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.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2014-09-04 19:44:09 +02:00 committed by Mark Brown
parent d7858bd647
commit 0e0f9b960a
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/adau1761.c
View File

@ -714,9 +714,9 @@ static int adau1761_codec_probe(struct snd_soc_codec *codec)
static const struct snd_soc_codec_driver adau1761_codec_driver = { static const struct snd_soc_codec_driver adau1761_codec_driver = {
.probe = adau1761_codec_probe, .probe = adau1761_codec_probe,
.suspend = adau17x1_suspend,
.resume = adau17x1_resume, .resume = adau17x1_resume,
.set_bias_level = adau1761_set_bias_level, .set_bias_level = adau1761_set_bias_level,
.suspend_bias_off = true,
.controls = adau1761_controls, .controls = adau1761_controls,
.num_controls = ARRAY_SIZE(adau1761_controls), .num_controls = ARRAY_SIZE(adau1761_controls),

2
sound/soc/codecs/adau1781.c
View File

@ -446,9 +446,9 @@ static int adau1781_codec_probe(struct snd_soc_codec *codec)
static const struct snd_soc_codec_driver adau1781_codec_driver = { static const struct snd_soc_codec_driver adau1781_codec_driver = {
.probe = adau1781_codec_probe, .probe = adau1781_codec_probe,
.suspend = adau17x1_suspend,
.resume = adau17x1_resume, .resume = adau17x1_resume,
.set_bias_level = adau1781_set_bias_level, .set_bias_level = adau1781_set_bias_level,
.suspend_bias_off = true,
.controls = adau1781_controls, .controls = adau1781_controls,
.num_controls = ARRAY_SIZE(adau1781_controls), .num_controls = ARRAY_SIZE(adau1781_controls),

8
sound/soc/codecs/adau17x1.c
View File

@ -815,13 +815,6 @@ int adau17x1_add_routes(struct snd_soc_codec *codec)
} }
EXPORT_SYMBOL_GPL(adau17x1_add_routes); EXPORT_SYMBOL_GPL(adau17x1_add_routes);
int adau17x1_suspend(struct snd_soc_codec *codec)
{
codec->driver->set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
EXPORT_SYMBOL_GPL(adau17x1_suspend);
int adau17x1_resume(struct snd_soc_codec *codec) int adau17x1_resume(struct snd_soc_codec *codec)
{ {
struct adau *adau = snd_soc_codec_get_drvdata(codec); struct adau *adau = snd_soc_codec_get_drvdata(codec);
@ -829,7 +822,6 @@ int adau17x1_resume(struct snd_soc_codec *codec)
if (adau->switch_mode) if (adau->switch_mode)
adau->switch_mode(codec->dev); adau->switch_mode(codec->dev);
codec->driver->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
regcache_sync(adau->regmap); regcache_sync(adau->regmap);
return 0; return 0;

1
sound/soc/codecs/adau17x1.h
View File

@ -52,7 +52,6 @@ int adau17x1_set_micbias_voltage(struct snd_soc_codec *codec,
enum adau17x1_micbias_voltage micbias); enum adau17x1_micbias_voltage micbias);
bool adau17x1_readable_register(struct device *dev, unsigned int reg); bool adau17x1_readable_register(struct device *dev, unsigned int reg);
bool adau17x1_volatile_register(struct device *dev, unsigned int reg); bool adau17x1_volatile_register(struct device *dev, unsigned int reg);
int adau17x1_suspend(struct snd_soc_codec *codec);
int adau17x1_resume(struct snd_soc_codec *codec); int adau17x1_resume(struct snd_soc_codec *codec);
extern const struct snd_soc_dai_ops adau17x1_dai_ops; extern const struct snd_soc_dai_ops adau17x1_dai_ops;