aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-09-06 08:29:31 -0400
committerMark Brown <broonie@kernel.org>2014-09-06 08:38:01 -0400
commit3d2c42d191a89ab35e3002309882e3b70fe12112 (patch)
treea5833d658e0058298599d4d7ed80ee35700d1f86 /sound
parent85362efb80070bed890602483f71cd103be303c2 (diff)
ASoC: 88pm860x-codec: 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@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/88pm860x-codec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 922006dd0583..4c3b0af39fd8 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1337,8 +1337,6 @@ static int pm860x_probe(struct snd_soc_codec *codec)
1337 } 1337 }
1338 } 1338 }
1339 1339
1340 pm860x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1341
1342 return 0; 1340 return 0;
1343 1341
1344out: 1342out:
@@ -1354,7 +1352,6 @@ static int pm860x_remove(struct snd_soc_codec *codec)
1354 1352
1355 for (i = 3; i >= 0; i--) 1353 for (i = 3; i >= 0; i--)
1356 free_irq(pm860x->irq[i], pm860x); 1354 free_irq(pm860x->irq[i], pm860x);
1357 pm860x_set_bias_level(codec, SND_SOC_BIAS_OFF);
1358 return 0; 1355 return 0;
1359} 1356}
1360 1357