aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-09-09 14:42:45 -0400
committerMark Brown <broonie@linaro.org>2014-09-09 16:08:47 -0400
commitf0b99ca041258ed0eb27dc724de22d84dab78a7c (patch)
tree7d7248280228513e8a980827c2774d02f1ba3ce1 /sound
parentee6b42ee21b16aa322758fdab0d57082761b09fd (diff)
ASoC: da732x: Cleanup manual bias level transitions
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: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/da732x.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index c28cf339f066..f35e83e00c8d 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1507,26 +1507,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
1507 return 0; 1507 return 0;
1508} 1508}
1509 1509
1510static int da732x_probe(struct snd_soc_codec *codec)
1511{
1512 struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec);
1513
1514 da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1515
1516 return 0;
1517}
1518
1519static int da732x_remove(struct snd_soc_codec *codec)
1520{
1521
1522 da732x_set_bias_level(codec, SND_SOC_BIAS_OFF);
1523
1524 return 0;
1525}
1526
1527static struct snd_soc_codec_driver soc_codec_dev_da732x = { 1510static struct snd_soc_codec_driver soc_codec_dev_da732x = {
1528 .probe = da732x_probe,
1529 .remove = da732x_remove,
1530 .set_bias_level = da732x_set_bias_level, 1511 .set_bias_level = da732x_set_bias_level,
1531 .controls = da732x_snd_controls, 1512 .controls = da732x_snd_controls,
1532 .num_controls = ARRAY_SIZE(da732x_snd_controls), 1513 .num_controls = ARRAY_SIZE(da732x_snd_controls),