mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ASoC: ad193x: Use snd_soc_update_bits for read-modify-write 

Use snd_soc_update_bits for read-modify-write register access instead of
open-coding it using snd_soc_read and snd_soc_write

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Barry Song <21cnbao@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-10-18 06:25:08 +08:00 committed by Mark Brown
parent 4b1cfcb4f3
commit 54c96cfd1a
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sound/soc/codecs/ad193x.c
View File

@ -103,12 +103,14 @@ static const struct snd_soc_dapm_route audio_paths[] = {
static int ad193x_mute(struct snd_soc_dai *dai, int mute) static int ad193x_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
int reg;
reg = snd_soc_read(codec, AD193X_DAC_CTRL2); if (mute)
reg = (mute > 0) ? reg | AD193X_DAC_MASTER_MUTE : reg & snd_soc_update_bits(codec, AD193X_DAC_CTRL2,
(~AD193X_DAC_MASTER_MUTE); AD193X_DAC_MASTER_MUTE,
snd_soc_write(codec, AD193X_DAC_CTRL2, reg); AD193X_DAC_MASTER_MUTE);
else
snd_soc_update_bits(codec, AD193X_DAC_CTRL2,
AD193X_DAC_MASTER_MUTE, 0);
return 0; return 0;
} }
@ -262,7 +264,7 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
int word_len = 0, reg = 0, master_rate = 0; int word_len = 0, master_rate = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
@ -297,18 +299,15 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream,
break; break;
} }
reg = snd_soc_read(codec, AD193X_PLL_CLK_CTRL0); snd_soc_update_bits(codec, AD193X_PLL_CLK_CTRL0,
reg = (reg & (~AD193X_PLL_INPUT_MASK)) | master_rate; AD193X_PLL_INPUT_MASK, master_rate);
snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, reg);
reg = snd_soc_read(codec, AD193X_DAC_CTRL2); snd_soc_update_bits(codec, AD193X_DAC_CTRL2,
reg = (reg & (~AD193X_DAC_WORD_LEN_MASK)) AD193X_DAC_WORD_LEN_MASK,
| (word_len << AD193X_DAC_WORD_LEN_SHFT); word_len << AD193X_DAC_WORD_LEN_SHFT);
snd_soc_write(codec, AD193X_DAC_CTRL2, reg);
reg = snd_soc_read(codec, AD193X_ADC_CTRL1); snd_soc_update_bits(codec, AD193X_ADC_CTRL1,
reg = (reg & (~AD193X_ADC_WORD_LEN_MASK)) | word_len; AD193X_ADC_WORD_LEN_MASK, word_len);
snd_soc_write(codec, AD193X_ADC_CTRL1, reg);
return 0; return 0;
} }