From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lars-Peter Clausen Subject: Re: [PATCH v2] ASoC: ad193x: Use snd_soc_update_bits for read-modify-write Date: Tue, 18 Oct 2011 17:47:20 +0200 Message-ID: <4E9D9F88.109@metafoo.de> References: <1318890308.15935.0.camel@phoenix> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-out-054.synserver.de (smtp-out-070.synserver.de [212.40.185.70]) by alsa0.perex.cz (Postfix) with ESMTP id 192F310384D for ; Tue, 18 Oct 2011 17:47:12 +0200 (CEST) In-Reply-To: <1318890308.15935.0.camel@phoenix> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Axel Lin Cc: alsa-devel@alsa-project.org, Mark Brown , Barry Song <21cnbao@gmail.com>, linux-kernel@vger.kernel.org, Liam Girdwood List-Id: alsa-devel@alsa-project.org On 10/18/2011 12:25 AM, Axel Lin 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 Acked-by: Lars-Peter Clausen Thanks > --- > sound/soc/codecs/ad193x.c | 31 +++++++++++++++---------------- > 1 files changed, 15 insertions(+), 16 deletions(-) > > diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c > index 39056ce..1206021 100644 > --- a/sound/soc/codecs/ad193x.c > +++ b/sound/soc/codecs/ad193x.c > @@ -103,12 +103,14 @@ static const struct snd_soc_dapm_route audio_paths[] = { > static int ad193x_mute(struct snd_soc_dai *dai, int mute) > { > struct snd_soc_codec *codec = dai->codec; > - int reg; > > - reg = snd_soc_read(codec, AD193X_DAC_CTRL2); > - reg = (mute > 0) ? reg | AD193X_DAC_MASTER_MUTE : reg & > - (~AD193X_DAC_MASTER_MUTE); > - snd_soc_write(codec, AD193X_DAC_CTRL2, reg); > + if (mute) > + snd_soc_update_bits(codec, AD193X_DAC_CTRL2, > + AD193X_DAC_MASTER_MUTE, > + AD193X_DAC_MASTER_MUTE); > + else > + snd_soc_update_bits(codec, AD193X_DAC_CTRL2, > + AD193X_DAC_MASTER_MUTE, 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_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_codec *codec = rtd->codec; > @@ -297,18 +299,15 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, > break; > } > > - reg = snd_soc_read(codec, AD193X_PLL_CLK_CTRL0); > - reg = (reg & (~AD193X_PLL_INPUT_MASK)) | master_rate; > - snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, reg); > + snd_soc_update_bits(codec, AD193X_PLL_CLK_CTRL0, > + AD193X_PLL_INPUT_MASK, master_rate); > > - reg = snd_soc_read(codec, AD193X_DAC_CTRL2); > - reg = (reg & (~AD193X_DAC_WORD_LEN_MASK)) > - | (word_len << AD193X_DAC_WORD_LEN_SHFT); > - snd_soc_write(codec, AD193X_DAC_CTRL2, reg); > + snd_soc_update_bits(codec, AD193X_DAC_CTRL2, > + AD193X_DAC_WORD_LEN_MASK, > + word_len << AD193X_DAC_WORD_LEN_SHFT); > > - reg = snd_soc_read(codec, AD193X_ADC_CTRL1); > - reg = (reg & (~AD193X_ADC_WORD_LEN_MASK)) | word_len; > - snd_soc_write(codec, AD193X_ADC_CTRL1, reg); > + snd_soc_update_bits(codec, AD193X_ADC_CTRL1, > + AD193X_ADC_WORD_LEN_MASK, word_len); > > return 0; > } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932673Ab1JRPrK (ORCPT ); Tue, 18 Oct 2011 11:47:10 -0400 Received: from smtp-out-070.synserver.de ([212.40.185.70]:1200 "EHLO smtp-out-054.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932541Ab1JRPrI (ORCPT ); Tue, 18 Oct 2011 11:47:08 -0400 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 1246 Message-ID: <4E9D9F88.109@metafoo.de> Date: Tue, 18 Oct 2011 17:47:20 +0200 From: Lars-Peter Clausen User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.23) Gecko/20111005 Iceowl/1.0b2 Icedove/3.1.15 MIME-Version: 1.0 To: Axel Lin CC: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Mark Brown , Barry Song <21cnbao@gmail.com>, Liam Girdwood Subject: Re: [alsa-devel] [PATCH v2] ASoC: ad193x: Use snd_soc_update_bits for read-modify-write References: <1318890308.15935.0.camel@phoenix> In-Reply-To: <1318890308.15935.0.camel@phoenix> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/18/2011 12:25 AM, Axel Lin 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 Acked-by: Lars-Peter Clausen Thanks > --- > sound/soc/codecs/ad193x.c | 31 +++++++++++++++---------------- > 1 files changed, 15 insertions(+), 16 deletions(-) > > diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c > index 39056ce..1206021 100644 > --- a/sound/soc/codecs/ad193x.c > +++ b/sound/soc/codecs/ad193x.c > @@ -103,12 +103,14 @@ static const struct snd_soc_dapm_route audio_paths[] = { > static int ad193x_mute(struct snd_soc_dai *dai, int mute) > { > struct snd_soc_codec *codec = dai->codec; > - int reg; > > - reg = snd_soc_read(codec, AD193X_DAC_CTRL2); > - reg = (mute > 0) ? reg | AD193X_DAC_MASTER_MUTE : reg & > - (~AD193X_DAC_MASTER_MUTE); > - snd_soc_write(codec, AD193X_DAC_CTRL2, reg); > + if (mute) > + snd_soc_update_bits(codec, AD193X_DAC_CTRL2, > + AD193X_DAC_MASTER_MUTE, > + AD193X_DAC_MASTER_MUTE); > + else > + snd_soc_update_bits(codec, AD193X_DAC_CTRL2, > + AD193X_DAC_MASTER_MUTE, 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_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_codec *codec = rtd->codec; > @@ -297,18 +299,15 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, > break; > } > > - reg = snd_soc_read(codec, AD193X_PLL_CLK_CTRL0); > - reg = (reg & (~AD193X_PLL_INPUT_MASK)) | master_rate; > - snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, reg); > + snd_soc_update_bits(codec, AD193X_PLL_CLK_CTRL0, > + AD193X_PLL_INPUT_MASK, master_rate); > > - reg = snd_soc_read(codec, AD193X_DAC_CTRL2); > - reg = (reg & (~AD193X_DAC_WORD_LEN_MASK)) > - | (word_len << AD193X_DAC_WORD_LEN_SHFT); > - snd_soc_write(codec, AD193X_DAC_CTRL2, reg); > + snd_soc_update_bits(codec, AD193X_DAC_CTRL2, > + AD193X_DAC_WORD_LEN_MASK, > + word_len << AD193X_DAC_WORD_LEN_SHFT); > > - reg = snd_soc_read(codec, AD193X_ADC_CTRL1); > - reg = (reg & (~AD193X_ADC_WORD_LEN_MASK)) | word_len; > - snd_soc_write(codec, AD193X_ADC_CTRL1, reg); > + snd_soc_update_bits(codec, AD193X_ADC_CTRL1, > + AD193X_ADC_WORD_LEN_MASK, word_len); > > return 0; > }