]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: cx20442: Replace direct snd_soc_codec dapm field access
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 11 May 2015 07:42:29 +0000 (09:42 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 11 May 2015 16:33:31 +0000 (17:33 +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/cx20442.c

index 13041ccf101061f0f6ce535e3743fa2476e1b185..d6f4abbbf8a7fd669237d667a03825c13c3603ed 100644 (file)
@@ -333,7 +333,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
 
        switch (level) {
        case SND_SOC_BIAS_PREPARE:
-               if (codec->dapm.bias_level != SND_SOC_BIAS_STANDBY)
+               if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_STANDBY)
                        break;
                if (IS_ERR(cx20442->por))
                        err = PTR_ERR(cx20442->por);
@@ -341,7 +341,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
                        err = regulator_enable(cx20442->por);
                break;
        case SND_SOC_BIAS_STANDBY:
-               if (codec->dapm.bias_level != SND_SOC_BIAS_PREPARE)
+               if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_PREPARE)
                        break;
                if (IS_ERR(cx20442->por))
                        err = PTR_ERR(cx20442->por);