diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-31 20:54:03 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-31 20:54:03 +0200 |
| commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
| tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /sound/soc/codecs/wm8998.c | |
| parent | Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus (diff) | |
| parent | Merge series "ASoC: core: Two step component registration" from Cezary Rojews... (diff) | |
| download | linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.tar.xz linux-84569f329f7fcb40b7b1860f273b2909dabf2a2b.zip | |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8998.c')
| -rw-r--r-- | sound/soc/codecs/wm8998.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c index 7c1899219573..f6c5cc80c970 100644 --- a/sound/soc/codecs/wm8998.c +++ b/sound/soc/codecs/wm8998.c @@ -43,7 +43,7 @@ static int wm8998_asrc_ev(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: - val = snd_soc_component_read32(component, ARIZONA_ASRC_RATE1); + val = snd_soc_component_read(component, ARIZONA_ASRC_RATE1); val &= ARIZONA_ASRC_RATE1_MASK; val >>= ARIZONA_ASRC_RATE1_SHIFT; @@ -51,7 +51,7 @@ static int wm8998_asrc_ev(struct snd_soc_dapm_widget *w, case 0: case 1: case 2: - val = snd_soc_component_read32(component, + val = snd_soc_component_read(component, ARIZONA_SAMPLE_RATE_1 + val); if (val >= 0x11) { dev_warn(component->dev, @@ -67,7 +67,7 @@ static int wm8998_asrc_ev(struct snd_soc_dapm_widget *w, return -EINVAL; } - val = snd_soc_component_read32(component, ARIZONA_ASRC_RATE2); + val = snd_soc_component_read(component, ARIZONA_ASRC_RATE2); val &= ARIZONA_ASRC_RATE2_MASK; val >>= ARIZONA_ASRC_RATE2_SHIFT; @@ -75,7 +75,7 @@ static int wm8998_asrc_ev(struct snd_soc_dapm_widget *w, case 8: case 9: val -= 0x8; - val = snd_soc_component_read32(component, + val = snd_soc_component_read(component, ARIZONA_ASYNC_SAMPLE_RATE_1 + val); if (val >= 0x11) { dev_warn(component->dev, |