diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-09-02 16:20:32 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-03 14:26:26 -0400 |
commit | 7d1a99da0861330f02de5c0f59df1d338477cb54 (patch) | |
tree | 1ab1b401f38141fd494547dfecb7a70ef1055a6d | |
parent | 8e6fe35eabc64f35eff5844a2e542c403a00db15 (diff) |
ASoC: tlv320aic3x: Remove unnecessary suspend/resume bias level changes
The ASoC core will only call the suspend/resume callbacks when the device's
DAPM context is idle. Since this driver sets idle_bias_off to true this
means that the device is already in SND_SOC_BIAS_OFF when the suspend
callback is called, so there is no need to manually set this state again.
There is also no need to go to SND_SOC_BIAS_STANDBY in the resume callback
since the core will go right back to SND_SOC_BIAS_OFF.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 64f179ee9834..f2c416d16b6c 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
@@ -1222,20 +1222,6 @@ static struct snd_soc_dai_driver aic3x_dai = { | |||
1222 | .symmetric_rates = 1, | 1222 | .symmetric_rates = 1, |
1223 | }; | 1223 | }; |
1224 | 1224 | ||
1225 | static int aic3x_suspend(struct snd_soc_codec *codec) | ||
1226 | { | ||
1227 | aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
1228 | |||
1229 | return 0; | ||
1230 | } | ||
1231 | |||
1232 | static int aic3x_resume(struct snd_soc_codec *codec) | ||
1233 | { | ||
1234 | aic3x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
1235 | |||
1236 | return 0; | ||
1237 | } | ||
1238 | |||
1239 | static void aic3x_mono_init(struct snd_soc_codec *codec) | 1225 | static void aic3x_mono_init(struct snd_soc_codec *codec) |
1240 | { | 1226 | { |
1241 | /* DAC to Mono Line Out default volume and route to Output mixer */ | 1227 | /* DAC to Mono Line Out default volume and route to Output mixer */ |
@@ -1429,8 +1415,6 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = { | |||
1429 | .idle_bias_off = true, | 1415 | .idle_bias_off = true, |
1430 | .probe = aic3x_probe, | 1416 | .probe = aic3x_probe, |
1431 | .remove = aic3x_remove, | 1417 | .remove = aic3x_remove, |
1432 | .suspend = aic3x_suspend, | ||
1433 | .resume = aic3x_resume, | ||
1434 | .controls = aic3x_snd_controls, | 1418 | .controls = aic3x_snd_controls, |
1435 | .num_controls = ARRAY_SIZE(aic3x_snd_controls), | 1419 | .num_controls = ARRAY_SIZE(aic3x_snd_controls), |
1436 | .dapm_widgets = aic3x_dapm_widgets, | 1420 | .dapm_widgets = aic3x_dapm_widgets, |