From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Oder Chiou <oder_chiou@realtek.com>,
Jack Yu <jack.yu@realtek.com>,
tiwai@suse.de,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
broonie@kernel.org, Shuming Fan <shumingf@realtek.com>,
Bard liao <yung-chuan.liao@linux.intel.com>
Subject: [PATCH 01/24] ASoC: rt1011: use logical OR
Date: Tue, 2 Mar 2021 15:25:04 -0600 [thread overview]
Message-ID: <20210302212527.55158-2-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20210302212527.55158-1-pierre-louis.bossart@linux.intel.com>
cppcheck complains a lot about mixing booleans and bitwise operations.
There is no good reason to use && and |, fix with ||
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/codecs/rt1011.c | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c
index 6877be5f36b9..b9dadc8243b3 100644
--- a/sound/soc/codecs/rt1011.c
+++ b/sound/soc/codecs/rt1011.c
@@ -1089,25 +1089,21 @@ static int rt1011_recv_spk_mode_put(struct snd_kcontrol *kcontrol,
static bool rt1011_validate_bq_drc_coeff(unsigned short reg)
{
- if ((reg == RT1011_DAC_SET_1) |
- (reg >= RT1011_ADC_SET && reg <= RT1011_ADC_SET_1) |
- (reg == RT1011_ADC_SET_4) | (reg == RT1011_ADC_SET_5) |
- (reg == RT1011_MIXER_1) |
- (reg == RT1011_A_TIMING_1) | (reg >= RT1011_POWER_7 &&
- reg <= RT1011_POWER_8) |
- (reg == RT1011_CLASS_D_POS) | (reg == RT1011_ANALOG_CTRL) |
- (reg >= RT1011_SPK_TEMP_PROTECT_0 &&
- reg <= RT1011_SPK_TEMP_PROTECT_6) |
- (reg >= RT1011_SPK_PRO_DC_DET_5 && reg <= RT1011_BAT_GAIN_1) |
- (reg >= RT1011_RT_DRC_CROSS && reg <= RT1011_RT_DRC_POS_8) |
- (reg >= RT1011_CROSS_BQ_SET_1 && reg <= RT1011_BQ_10_A2_15_0) |
- (reg >= RT1011_SMART_BOOST_TIMING_1 &&
- reg <= RT1011_SMART_BOOST_TIMING_36) |
- (reg == RT1011_SINE_GEN_REG_1) |
- (reg >= RT1011_STP_ALPHA_RECIPROCAL_MSB &&
- reg <= RT1011_BQ_6_PARAMS_CHECK_5) |
- (reg >= RT1011_BQ_7_PARAMS_CHECK_1 &&
- reg <= RT1011_BQ_10_PARAMS_CHECK_5))
+ if ((reg == RT1011_DAC_SET_1) ||
+ (reg >= RT1011_ADC_SET && reg <= RT1011_ADC_SET_1) ||
+ (reg == RT1011_ADC_SET_4) || (reg == RT1011_ADC_SET_5) ||
+ (reg == RT1011_MIXER_1) ||
+ (reg == RT1011_A_TIMING_1) ||
+ (reg >= RT1011_POWER_7 && reg <= RT1011_POWER_8) ||
+ (reg == RT1011_CLASS_D_POS) || (reg == RT1011_ANALOG_CTRL) ||
+ (reg >= RT1011_SPK_TEMP_PROTECT_0 && reg <= RT1011_SPK_TEMP_PROTECT_6) ||
+ (reg >= RT1011_SPK_PRO_DC_DET_5 && reg <= RT1011_BAT_GAIN_1) ||
+ (reg >= RT1011_RT_DRC_CROSS && reg <= RT1011_RT_DRC_POS_8) ||
+ (reg >= RT1011_CROSS_BQ_SET_1 && reg <= RT1011_BQ_10_A2_15_0) ||
+ (reg >= RT1011_SMART_BOOST_TIMING_1 && reg <= RT1011_SMART_BOOST_TIMING_36) ||
+ (reg == RT1011_SINE_GEN_REG_1) ||
+ (reg >= RT1011_STP_ALPHA_RECIPROCAL_MSB && reg <= RT1011_BQ_6_PARAMS_CHECK_5) ||
+ (reg >= RT1011_BQ_7_PARAMS_CHECK_1 && reg <= RT1011_BQ_10_PARAMS_CHECK_5))
return true;
return false;
--
2.25.1
next prev parent reply other threads:[~2021-03-02 21:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 21:25 [PATCH 00/24] ASoC: realtek: fix cppcheck warnings Pierre-Louis Bossart
2021-03-02 21:25 ` Pierre-Louis Bossart [this message]
2021-03-02 21:25 ` [PATCH 02/24] ASoC: rt1011: remove redundant test Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 03/24] ASoC: rt1011: clarify expression Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 04/24] ASoC: rt1015: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 05/24] ASoC: rt1016: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 06/24] ASoC: rt1305: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 07/24] ASoC: rt1308: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 08/24] ASoC: rt5640: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 09/24] ASoC: rt5645: use logical OR Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 10/24] ASoC: rt5645: clarify expression Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 11/24] ASoC: rt5651: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 12/24] ASoC: rt5651: remove useless assignment Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 13/24] ASoC: rt5659: clarify expression Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 14/24] ASoC: rt5660: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 15/24] ASoC: rt5663: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 16/24] ASoC: rt5665: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 17/24] ASoC: rt5668: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 18/24] ASoC: rt5668: remove useless assignments Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 19/24] ASoC: rt5670: clarify expression Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 20/24] ASoC: rt5677: " Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 21/24] ASoC: rt5677: remove useless assignment Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 22/24] ASoC: rt5682: clarify expression Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 23/24] ASoC: rt5682: remove useless assignments Pierre-Louis Bossart
2021-03-02 21:25 ` [PATCH 24/24] ASoC: rt5682: remove useless initialization Pierre-Louis Bossart
2021-03-04 0:54 ` [PATCH 00/24] ASoC: realtek: fix cppcheck warnings Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210302212527.55158-2-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=jack.yu@realtek.com \
--cc=oder_chiou@realtek.com \
--cc=shumingf@realtek.com \
--cc=tiwai@suse.de \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).