]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: max98095: Replace direct snd_soc_codec dapm field access
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 14 May 2015 09:20:02 +0000 (11:20 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 18 May 2015 03:46:56 +0000 (04:46 +0100)
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>
sound/soc/codecs/max98095.c

index 66c7ca431a2ed974bf45b53e2e408577703ac47f..2b8b8a5f385f015bad02841d92eab568de2ec6a7 100644 (file)
@@ -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) {