ASoC: sirf-audio-codec: Simplify the new bitmask value in regmap_update_bits
authorAxel Lin <axel.lin@ingics.com>
Thu, 8 May 2014 08:29:49 +0000 (16:29 +0800)
committerMark Brown <broonie@linaro.org>
Mon, 26 May 2014 16:00:39 +0000 (17:00 +0100)
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>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/sirf-audio-codec.c

index c5177bc5df820948f19f8e9cf909bd88d1aaec5c..d90cb0fafcb27d54142f8a2e81df5fd607c4d89e 100644 (file)
@@ -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;