OSDN Git Service

ASoC: ssm2518: Cleanup manual bias level transitions
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 4 Sep 2014 17:44:11 +0000 (19:44 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 4 Sep 2014 19:10:25 +0000 (20:10 +0100)
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_OFF at the end of CODEC probe()
can also be removed as the CODEC is already in OFF state at this point.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/ssm2518.c

index e8680be..67ea55a 100644 (file)
@@ -646,17 +646,6 @@ static struct snd_soc_dai_driver ssm2518_dai = {
        .ops = &ssm2518_dai_ops,
 };
 
-static int ssm2518_probe(struct snd_soc_codec *codec)
-{
-       return ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF);
-}
-
-static int ssm2518_remove(struct snd_soc_codec *codec)
-{
-       ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       return 0;
-}
-
 static int ssm2518_set_sysclk(struct snd_soc_codec *codec, int clk_id,
        int source, unsigned int freq, int dir)
 {
@@ -727,8 +716,6 @@ static int ssm2518_set_sysclk(struct snd_soc_codec *codec, int clk_id,
 }
 
 static struct snd_soc_codec_driver ssm2518_codec_driver = {
-       .probe = ssm2518_probe,
-       .remove = ssm2518_remove,
        .set_bias_level = ssm2518_set_bias_level,
        .set_sysclk = ssm2518_set_sysclk,
        .idle_bias_off = true,