| Message ID | 1399537789.21710.1.camel@phoenix (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 772bc594dad0d721ccf38a39322baa2281dd0f74 |
| Headers | show |
On ?, 2014-05-08 at 16:29 +0800, Axel Lin wrote: > Having the binary ones complement operator in the new bitmak value makes the > code hard to read. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> > --- > I think the binary ones complement operator in such use case is error prone: > For example: > To set BIT(1) and clear both BIT(2) and BIT(3): > The following code has wrong result: > regmap_update_bits(regmap, the_register, BIT(1), BIT(2), BIT(3), > BIT(1) | ~BIT(2) | ~BIT(3)); Oops, I mean: regmap_update_bits(regmap, the_register, BIT(1) | BIT(2)| BIT(3), BIT(1) | ~BIT(2) | ~BIT(3)); Axel
On Thu, May 08, 2014 at 04:29:49PM +0800, Axel Lin wrote: > Having the binary ones complement operator in the new bitmak value makes the > code hard to read. Applied, thanks.
diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index c5177bc..d90cb0f 100644 --- a/sound/soc/codecs/sirf-audio-codec.c +++ b/sound/soc/codecs/sirf-audio-codec.c @@ -109,7 +109,7 @@ static void enable_and_reset_codec(struct regmap *regmap, { regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1, codec_enable_bits | codec_reset_bits, - codec_enable_bits | ~codec_reset_bits); + codec_enable_bits); msleep(20); regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1, codec_reset_bits, codec_reset_bits); @@ -128,8 +128,7 @@ static int atlas6_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_POST_PMD: regmap_update_bits(sirf_audio_codec->regmap, - AUDIO_IC_CODEC_CTRL1, ATLAS6_CODEC_ENABLE_BITS, - ~ATLAS6_CODEC_ENABLE_BITS); + AUDIO_IC_CODEC_CTRL1, ATLAS6_CODEC_ENABLE_BITS, 0); break; default: break; @@ -151,8 +150,7 @@ static int prima2_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_POST_PMD: regmap_update_bits(sirf_audio_codec->regmap, - AUDIO_IC_CODEC_CTRL1, PRIMA2_CODEC_ENABLE_BITS, - ~PRIMA2_CODEC_ENABLE_BITS); + AUDIO_IC_CODEC_CTRL1, PRIMA2_CODEC_ENABLE_BITS, 0); break; default: break;
Having the binary ones complement operator in the new bitmak value makes the code hard to read. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- I think the binary ones complement operator in such use case is error prone: For example: To set BIT(1) and clear both BIT(2) and BIT(3): The following code has wrong result: regmap_update_bits(regmap, the_register, BIT(1), BIT(2), BIT(3), BIT(1) | ~BIT(2) | ~BIT(3)); Axel sound/soc/codecs/sirf-audio-codec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)