OSDN Git Service

ASoC: wcd9335: remove always-true condition
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Mon, 22 Aug 2022 18:42:37 +0000 (20:42 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 31 Aug 2022 11:13:02 +0000 (12:13 +0100)
cppcheck warning:

sound/soc/codecs/wcd9335.c:1824:22: style: Condition 'tx_port==13' is
always true [knownConditionTrueFalse]
  } else if (tx_port == 13) {
                     ^
sound/soc/codecs/wcd9335.c:1802:16: note: Assuming that condition
'tx_port==12' is not redundant
  if ((tx_port == 12) || (tx_port >= 14)) {
               ^
sound/soc/codecs/wcd9335.c:1802:35: note: Assuming that condition
'tx_port>=14' is not redundant
  if ((tx_port == 12) || (tx_port >= 14)) {
                                  ^
sound/soc/codecs/wcd9335.c:1824:22: note: Condition 'tx_port==13' is
always true
  } else if (tx_port == 13) {
                     ^
sound/soc/codecs/wcd9335.c:1845:22: style: Condition 'tx_port==13' is
always true [knownConditionTrueFalse]
  } else if (tx_port == 13) {
                     ^
sound/soc/codecs/wcd9335.c:1802:16: note: Assuming that condition
'tx_port==12' is not redundant
  if ((tx_port == 12) || (tx_port >= 14)) {
               ^
sound/soc/codecs/wcd9335.c:1802:35: note: Assuming that condition
'tx_port>=14' is not redundant
  if ((tx_port == 12) || (tx_port >= 14)) {
                                  ^
sound/soc/codecs/wcd9335.c:1845:22: note: Condition 'tx_port==13' is
always true
  } else if (tx_port == 13) {
                     ^

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Chao Song <chao.song@intel.com>
Link: https://lore.kernel.org/r/20220822184239.169757-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wcd9335.c

index 2c5aa4d..06c6adb 100644 (file)
@@ -1821,12 +1821,10 @@ static int wcd9335_set_decimator_rate(struct snd_soc_dai *dai,
                        tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG3;
                        shift = 0;
                        shift_val = 0x0F;
-               } else if (tx_port == 13) {
+               } else /* (tx_port == 13) */ {
                        tx_port_reg = WCD9335_CDC_IF_ROUTER_TX_MUX_CFG3;
                        shift = 4;
                        shift_val = 0x03;
-               } else {
-                       return -EINVAL;
                }
 
                tx_mux_sel = snd_soc_component_read(comp, tx_port_reg) &