| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CABS+qY37N5dm+aZj3Q436J1SDTveOi5KvkWXGhaPeoOpB_8xeQ@mail.gmail.com>
Date: Thu, 27 Oct 2011 10:18:17 +0100
From: "Girdwood, Liam" <lrg@...com>
To: Axel Lin <axel.lin@...il.com>
Cc: linux-kernel@...r.kernel.org,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Jarkko Nikula <jhnikula@...il.com>,
Vladimir Barinov <vbarinov@...eddedalley.com>,
alsa-devel@...a-project.org
Subject: Re: [PATCH] ASoC: tlv320aic3x: Use snd_soc_update_bits for read-modify-write
On 26 October 2011 15:13, Axel Lin <axel.lin@...il.com> wrote:
> 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@...il.com>
> ---
> sound/soc/codecs/tlv320aic3x.c | 41 +++++++++++++--------------------------
> 1 files changed, 14 insertions(+), 27 deletions(-)
>
> diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
> index 7a49390..a77f6ea 100644
> --- a/sound/soc/codecs/tlv320aic3x.c
> +++ b/sound/soc/codecs/tlv320aic3x.c
> @@ -833,7 +833,6 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
> int codec_clk = 0, bypass_pll = 0, fsref, last_clk = 0;
> u8 data, j, r, p, pll_q, pll_p = 1, pll_r = 1, pll_j = 1;
> u16 d, pll_d = 1;
> - u8 reg;
> int clk;
>
> /* select data word length */
> @@ -869,14 +868,13 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
> snd_soc_write(codec, AIC3X_PLL_PROGA_REG, pll_q << PLLQ_SHIFT);
> snd_soc_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_CLKDIV);
> /* disable PLL if it is bypassed */
> - reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG);
> - snd_soc_write(codec, AIC3X_PLL_PROGA_REG, reg & ~PLL_ENABLE);
> + snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG, PLL_ENABLE, 0);
>
> } else {
> snd_soc_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_PLLDIV);
> /* enable PLL when it is used */
> - reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG);
> - snd_soc_write(codec, AIC3X_PLL_PROGA_REG, reg | PLL_ENABLE);
> + snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG,
> + PLL_ENABLE, PLL_ENABLE);
> }
>
> /* Route Left DAC to left channel input and
> @@ -1155,7 +1153,6 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
> enum snd_soc_bias_level level)
> {
> struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
> - u8 reg;
>
> switch (level) {
> case SND_SOC_BIAS_ON:
> @@ -1164,9 +1161,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
> if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY &&
> aic3x->master) {
> /* enable pll */
> - reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG);
> - snd_soc_write(codec, AIC3X_PLL_PROGA_REG,
> - reg | PLL_ENABLE);
> + snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG,
> + PLL_ENABLE, PLL_ENABLE);
> }
> break;
> case SND_SOC_BIAS_STANDBY:
> @@ -1175,9 +1171,8 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
> if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE &&
> aic3x->master) {
> /* disable pll */
> - reg = snd_soc_read(codec, AIC3X_PLL_PROGA_REG);
> - snd_soc_write(codec, AIC3X_PLL_PROGA_REG,
> - reg & ~PLL_ENABLE);
> + snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG,
> + PLL_ENABLE, 0);
> }
> break;
> case SND_SOC_BIAS_OFF:
> @@ -1294,7 +1289,6 @@ static int aic3x_resume(struct snd_soc_codec *codec)
> static int aic3x_init(struct snd_soc_codec *codec)
> {
> struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
> - int reg;
>
> snd_soc_write(codec, AIC3X_PAGE_SELECT, PAGE0_SELECT);
> snd_soc_write(codec, AIC3X_RESET, SOFT_RESET);
> @@ -1316,20 +1310,13 @@ static int aic3x_init(struct snd_soc_codec *codec)
> snd_soc_write(codec, DACR1_2_MONOLOPM_VOL, DEFAULT_VOL | ROUTE_ON);
>
> /* unmute all outputs */
> - reg = snd_soc_read(codec, LLOPM_CTRL);
> - snd_soc_write(codec, LLOPM_CTRL, reg | UNMUTE);
> - reg = snd_soc_read(codec, RLOPM_CTRL);
> - snd_soc_write(codec, RLOPM_CTRL, reg | UNMUTE);
> - reg = snd_soc_read(codec, MONOLOPM_CTRL);
> - snd_soc_write(codec, MONOLOPM_CTRL, reg | UNMUTE);
> - reg = snd_soc_read(codec, HPLOUT_CTRL);
> - snd_soc_write(codec, HPLOUT_CTRL, reg | UNMUTE);
> - reg = snd_soc_read(codec, HPROUT_CTRL);
> - snd_soc_write(codec, HPROUT_CTRL, reg | UNMUTE);
> - reg = snd_soc_read(codec, HPLCOM_CTRL);
> - snd_soc_write(codec, HPLCOM_CTRL, reg | UNMUTE);
> - reg = snd_soc_read(codec, HPRCOM_CTRL);
> - snd_soc_write(codec, HPRCOM_CTRL, reg | UNMUTE);
> + snd_soc_update_bits(codec, LLOPM_CTRL, UNMUTE, UNMUTE);
> + snd_soc_update_bits(codec, RLOPM_CTRL, UNMUTE, UNMUTE);
> + snd_soc_update_bits(codec, MONOLOPM_CTRL, UNMUTE, UNMUTE);
> + snd_soc_update_bits(codec, HPLOUT_CTRL, UNMUTE, UNMUTE);
> + snd_soc_update_bits(codec, HPROUT_CTRL, UNMUTE, UNMUTE);
> + snd_soc_update_bits(codec, HPLCOM_CTRL, UNMUTE, UNMUTE);
> + snd_soc_update_bits(codec, HPRCOM_CTRL, UNMUTE, UNMUTE);
>
> /* ADC default volume and unmute */
> snd_soc_write(codec, LADC_VOL, DEFAULT_GAIN);
> --
> 1.7.5.4
>
>
>
>
Acked-by: Liam Girdwood <lrg@...com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists