ASoC: rt1011: remove redundant test
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tue, 2 Mar 2021 21:25:05 +0000 (15:25 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 10 Mar 2021 13:09:54 +0000 (13:09 +0000)
cppcheck warning:

sound/soc/codecs/rt1011.c:1994:6: style: Condition 'tx_slotnum' is
always true [knownConditionTrueFalse]
 if (tx_slotnum)
     ^
sound/soc/codecs/rt1011.c:1895:24: note: Assuming that condition
'!tx_slotnum' is not redundant
 if (tx_slotnum > 2 || !tx_slotnum) {
                       ^
sound/soc/codecs/rt1011.c:1994:6: note: Condition 'tx_slotnum' is
always true
if (tx_slotnum)
     ^

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210302212527.55158-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt1011.c

index b9dadc8243b33478e7c07345318532e50e1e7f4b..39a9f17ca0a96c84fcd743ab3f7ae9047aef1209 100644 (file)
@@ -1987,10 +1987,10 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
                RT1011_TDM_I2S_DOCK_EN_1_MASK, tdm_en);
        snd_soc_component_update_bits(component, RT1011_TDM2_SET_2,
                RT1011_TDM_I2S_DOCK_EN_2_MASK, tdm_en);
-       if (tx_slotnum)
-               snd_soc_component_update_bits(component, RT1011_TDM_TOTAL_SET,
-                       RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG,
-                       RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT);
+
+       snd_soc_component_update_bits(component, RT1011_TDM_TOTAL_SET,
+               RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG,
+               RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT);
 
 _set_tdm_err_:
        snd_soc_dapm_mutex_unlock(dapm);