aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ssm4567.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-04-27 22:13:25 +0200
committerMark Brown <broonie@kernel.org>2015-04-27 21:34:45 +0100
commitf4bf8d770b58862c2af9d17adc2fee05bef8f2c0 (patch)
tree0323e26496eb2ebe7cccae6239a03f90463a4b65 /sound/soc/codecs/ssm4567.c
parentASoC: Route all bias level updates through the core (diff)
downloadlinux-dev-f4bf8d770b58862c2af9d17adc2fee05bef8f2c0.tar.xz
linux-dev-f4bf8d770b58862c2af9d17adc2fee05bef8f2c0.zip
ASoC: Move bias level update to the core
All drivers have the same line at the end of the set_bias_level callback to update the bias_level state. Move this update into snd_soc_dapm_force_bias_level() and remove them from the drivers. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/ssm4567.c')
-rw-r--r--sound/soc/codecs/ssm4567.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c
index a984485108cd..643bcff4a919 100644
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@ -361,12 +361,7 @@ static int ssm4567_set_bias_level(struct snd_soc_codec *codec,
break;
}
- if (ret)
- return ret;
-
- codec->dapm.bias_level = level;
-
- return 0;
+ return ret;
}
static const struct snd_soc_dai_ops ssm4567_dai_ops = {