diff options
| author | Axel Lin <axel.lin@ingics.com> | 2014-05-08 16:29:49 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-26 17:00:39 +0100 |
| commit | 772bc594dad0d721ccf38a39322baa2281dd0f74 (patch) | |
| tree | bc5b714b01364c09f1dd5656eaedbe9b53b7fdae /sound | |
| parent | b87704cef258a4f44ab1386a70b7628ec3cefd36 (diff) | |
| download | op-kernel-dev-772bc594dad0d721ccf38a39322baa2281dd0f74.zip op-kernel-dev-772bc594dad0d721ccf38a39322baa2281dd0f74.tar.gz | |
ASoC: sirf-audio-codec: Simplify the new bitmask value in regmap_update_bits
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sirf-audio-codec.c | 8 |
1 files changed, 3 insertions, 5 deletions
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; |
