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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index e4743684cc1d7065a9218f6c3cf772fd27ed0e4e..3a7de0159f2464f14f124de3cc09741e0f49e612 100644 (file)
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -194,7 +194,7 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
                break;
 
        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");
                        /* power up the pll */
                        snd_soc_write(codec, SN95031_AUDPLLCTRL, BIT(5));
@@ -205,17 +205,22 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
                break;
 
        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");
                        /* power up the rail */
                        snd_soc_write(codec, SN95031_VAUD,
                                        BIT(2)|BIT(1)|BIT(0));
                        msleep(1);
-               } else if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) {
+                       break;
+               case SND_SOC_BIAS_PREPARE:
                        /* turn off pcm */
                        pr_debug("vaud_bias power dn pcm\n");
                        snd_soc_update_bits(codec, SN95031_PCM2C2, BIT(0), 0);
                        snd_soc_write(codec, SN95031_AUDPLLCTRL, 0);
+                       break;
+               default:
+                       break;
                }
                break;