diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-05-14 11:20:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-18 04:46:56 +0100 |
| commit | 1179a3685022e954b0de1df12b5711229918c4ae (patch) | |
| tree | c657bd93b2be2cb75aba43c85339f6379778f89a /sound/soc/codecs/max98095.c | |
| parent | 29ca43bc548e1b0060c8426b98a2ce9601cd5a17 (diff) | |
| download | op-kernel-dev-1179a3685022e954b0de1df12b5711229918c4ae.zip op-kernel-dev-1179a3685022e954b0de1df12b5711229918c4ae.tar.gz | |
ASoC: max98095: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to
codec->dapm.bias_level with snd_soc_codec_get_bias_level().
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 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 66c7ca4..2b8b8a5 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -1650,16 +1650,17 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec, * away from ON. Disable the clock in that case, otherwise * enable it. */ - if (!IS_ERR(max98095->mclk)) { - if (codec->dapm.bias_level == SND_SOC_BIAS_ON) - clk_disable_unprepare(max98095->mclk); - else - clk_prepare_enable(max98095->mclk); - } + if (IS_ERR(max98095->mclk)) + break; + + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) + clk_disable_unprepare(max98095->mclk); + else + clk_prepare_enable(max98095->mclk); break; case SND_SOC_BIAS_STANDBY: - if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { ret = regcache_sync(max98095->regmap); if (ret != 0) { |
