ASoC: rt5631: Replace direct snd_soc_codec dapm field access
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 19 May 2015 19:49:07 +0000 (21:49 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 20 May 2015 10:18:32 +0000 (11:18 +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() and
snd_soc_codec_init_bias_level().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5631.c

index e285d8a..058167c 100644 (file)
@@ -1546,7 +1546,7 @@ static int rt5631_set_bias_level(struct snd_soc_codec *codec,
                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) {
                        snd_soc_update_bits(codec, RT5631_PWR_MANAG_ADD3,
                                RT5631_PWR_VREF | RT5631_PWR_MAIN_BIAS,
                                RT5631_PWR_VREF | RT5631_PWR_MAIN_BIAS);
@@ -1614,7 +1614,7 @@ static int rt5631_probe(struct snd_soc_codec *codec)
                        RT5631_DMIC_R_CH_LATCH_RISING);
        }
 
-       codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
+       snd_soc_codec_init_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
        return 0;
 }