ASoC: Remove direct register cache accesses from WM8962 driver

commit 38f3f31a0a797bdbcc0cdb12553bbecc2f9a91c4 upstream.

Also fix return values for speaker switch updates.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index d2c315fa1b9b8b8ed379dcce84a85511a45116f8..1af315778ebaf4194ff99acfa674d80b3fa9db5d 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2021,7 +2021,6 @@ static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol,
                            struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-       u16 *reg_cache = codec->reg_cache;
        int ret;
 
        /* Apply the update (if any) */
@@ -2030,16 +2029,19 @@ static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol,
                return 0;
 
        /* If the left PGA is enabled hit that VU bit... */
-       if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_SPKOUTL_PGA_ENA)
-               return snd_soc_write(codec, WM8962_SPKOUTL_VOLUME,
-                                    reg_cache[WM8962_SPKOUTL_VOLUME]);
+       ret = snd_soc_read(codec, WM8962_PWR_MGMT_2);
+       if (ret & WM8962_SPKOUTL_PGA_ENA) {
+               snd_soc_write(codec, WM8962_SPKOUTL_VOLUME,
+                             snd_soc_read(codec, WM8962_SPKOUTL_VOLUME));
+               return 1;
+       }
 
        /* ...otherwise the right.  The VU is stereo. */
-       if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_SPKOUTR_PGA_ENA)
-               return snd_soc_write(codec, WM8962_SPKOUTR_VOLUME,
-                                    reg_cache[WM8962_SPKOUTR_VOLUME]);
+       if (ret & WM8962_SPKOUTR_PGA_ENA)
+               snd_soc_write(codec, WM8962_SPKOUTR_VOLUME,
+                             snd_soc_read(codec, WM8962_SPKOUTR_VOLUME));
 
-       return 0;
+       return 1;
 }
 
 static const char *cap_hpf_mode_text[] = {
@@ -2365,7 +2367,6 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *kcontrol, int event)
 {
        struct snd_soc_codec *codec = w->codec;
-       u16 *reg_cache = codec->reg_cache;
        int reg;
 
        switch (w->shift) {
@@ -2388,7 +2389,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
 
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
-               return snd_soc_write(codec, reg, reg_cache[reg]);
+               return snd_soc_write(codec, reg, snd_soc_read(codec, reg));
        default:
                BUG();
                return -EINVAL;