Skip to content

Commit

Permalink
ASoC: rt5631: Replace direct snd_soc_codec dapm field access
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed May 20, 2015
1 parent b1cd845 commit 61aad0b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/codecs/rt5631.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 61aad0b

Please sign in to comment.