Commit 22310d32 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: sn95031: 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().

While we are at it also replace the if(x == A) ... else if(x == B) ...
construct with a switch-case.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45a110a1
...@@ -194,7 +194,7 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec, ...@@ -194,7 +194,7 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_PREPARE: 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) {
pr_debug("vaud_bias powering up pll\n"); pr_debug("vaud_bias powering up pll\n");
/* power up the pll */ /* power up the pll */
snd_soc_write(codec, SN95031_AUDPLLCTRL, BIT(5)); snd_soc_write(codec, SN95031_AUDPLLCTRL, BIT(5));
...@@ -205,17 +205,22 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec, ...@@ -205,17 +205,22 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { switch (snd_soc_codec_get_bias_level(codec)) {
case SND_SOC_BIAS_OFF:
pr_debug("vaud_bias power up rail\n"); pr_debug("vaud_bias power up rail\n");
/* power up the rail */ /* power up the rail */
snd_soc_write(codec, SN95031_VAUD, snd_soc_write(codec, SN95031_VAUD,
BIT(2)|BIT(1)|BIT(0)); BIT(2)|BIT(1)|BIT(0));
msleep(1); msleep(1);
} else if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) { break;
case SND_SOC_BIAS_PREPARE:
/* turn off pcm */ /* turn off pcm */
pr_debug("vaud_bias power dn pcm\n"); pr_debug("vaud_bias power dn pcm\n");
snd_soc_update_bits(codec, SN95031_PCM2C2, BIT(0), 0); snd_soc_update_bits(codec, SN95031_PCM2C2, BIT(0), 0);
snd_soc_write(codec, SN95031_AUDPLLCTRL, 0); snd_soc_write(codec, SN95031_AUDPLLCTRL, 0);
break;
default:
break;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment