diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-04-27 22:13:24 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-27 21:34:45 +0100 |
commit | bd1204cb51f15d202f95222e873a94ed5d07b784 (patch) | |
tree | 1613bc56de735f9b572c9eb579c999439fed4d3f /sound/soc/codecs/max98095.c | |
parent | fa880775ab0d5a8d540972f7b6800fad1af16b75 (diff) | |
download | linux-stable-bd1204cb51f15d202f95222e873a94ed5d07b784.tar.gz linux-stable-bd1204cb51f15d202f95222e873a94ed5d07b784.tar.bz2 linux-stable-bd1204cb51f15d202f95222e873a94ed5d07b784.zip |
ASoC: Route all bias level updates through the core
Use the new snd_soc_codec_force_bias_level() helper function to invoke the
bias_level callback of a driver instead of calling the callback by hand.
Currently the effect of this is the same, but having all bias level updates
go through a central place will allow us to move more of the bias level
management into the DAPM core.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/max98095.c')
-rw-r--r-- | sound/soc/codecs/max98095.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 8fba0c3db798..d6e80a932ec3 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -2198,7 +2198,7 @@ static int max98095_suspend(struct snd_soc_codec *codec) if (max98095->headphone_jack || max98095->mic_jack) max98095_jack_detect_disable(codec); - max98095_set_bias_level(codec, SND_SOC_BIAS_OFF); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); return 0; } @@ -2208,7 +2208,7 @@ static int max98095_resume(struct snd_soc_codec *codec) struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); struct i2c_client *client = to_i2c_client(codec->dev); - max98095_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); if (max98095->headphone_jack || max98095->mic_jack) { max98095_jack_detect_enable(codec); |