ASoC: Remove direct register cache accesses from WM8962 driver
Subsystems (3)
PATCH 1/1 ASoC: Remove direct register cache accesses from WM8962 driver
Also fix return values for speaker switch updates.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8962.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-)
sound/soc/codecs/wm8962.c +11 -10
@@ -2141,7 +2141,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) */
@@ -2150,16 +2149,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[] = {
@@ -2500,7 +2502,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) {
@@ -2523,7 +2524,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 ;
Signature · 1 line
1.7.6.3