diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-05-08 04:29:49 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-26 12:00:39 -0400 |
commit | 772bc594dad0d721ccf38a39322baa2281dd0f74 (patch) | |
tree | bc5b714b01364c09f1dd5656eaedbe9b53b7fdae /sound | |
parent | b87704cef258a4f44ab1386a70b7628ec3cefd36 (diff) |
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 c5177bc5df82..d90cb0fafcb2 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, | |||
109 | { | 109 | { |
110 | regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1, | 110 | regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1, |
111 | codec_enable_bits | codec_reset_bits, | 111 | codec_enable_bits | codec_reset_bits, |
112 | codec_enable_bits | ~codec_reset_bits); | 112 | codec_enable_bits); |
113 | msleep(20); | 113 | msleep(20); |
114 | regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1, | 114 | regmap_update_bits(regmap, AUDIO_IC_CODEC_CTRL1, |
115 | codec_reset_bits, codec_reset_bits); | 115 | codec_reset_bits, codec_reset_bits); |
@@ -128,8 +128,7 @@ static int atlas6_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w, | |||
128 | break; | 128 | break; |
129 | case SND_SOC_DAPM_POST_PMD: | 129 | case SND_SOC_DAPM_POST_PMD: |
130 | regmap_update_bits(sirf_audio_codec->regmap, | 130 | regmap_update_bits(sirf_audio_codec->regmap, |
131 | AUDIO_IC_CODEC_CTRL1, ATLAS6_CODEC_ENABLE_BITS, | 131 | AUDIO_IC_CODEC_CTRL1, ATLAS6_CODEC_ENABLE_BITS, 0); |
132 | ~ATLAS6_CODEC_ENABLE_BITS); | ||
133 | break; | 132 | break; |
134 | default: | 133 | default: |
135 | break; | 134 | break; |
@@ -151,8 +150,7 @@ static int prima2_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w, | |||
151 | break; | 150 | break; |
152 | case SND_SOC_DAPM_POST_PMD: | 151 | case SND_SOC_DAPM_POST_PMD: |
153 | regmap_update_bits(sirf_audio_codec->regmap, | 152 | regmap_update_bits(sirf_audio_codec->regmap, |
154 | AUDIO_IC_CODEC_CTRL1, PRIMA2_CODEC_ENABLE_BITS, | 153 | AUDIO_IC_CODEC_CTRL1, PRIMA2_CODEC_ENABLE_BITS, 0); |
155 | ~PRIMA2_CODEC_ENABLE_BITS); | ||
156 | break; | 154 | break; |
157 | default: | 155 | default: |
158 | break; | 156 | break; |