Skip to contentSkip to conversation

ASoC: rt712-sdca: remove redundant else path of if statement

PATCH Superseded Colin Ian King 3 participants 3 messages May 7, 2025 – May 8, 2025

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: rt712-sdca: remove redundant else path of if statement

There is an if/else check where the else part is executed if adc_vol_flag is true, this else path checks if adc_vol_flag is true (which is a redundant second check) and the if path is always taken. Remove the redundant check and remove the else path since that can never occur.

---
 sound/soc/codecs/rt712-sdca.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/codecs/rt712-sdca.c +2 -6
index 19d99b9d4ab2..570c2af1245d 100644
@@ -1065,12 +1065,8 @@ static int rt712_sdca_dmic_set_gain_get(struct snd_kcontrol *kcontrol,
 
 		if (!adc_vol_flag) /* boost gain */
 			ctl = regvalue / 0x0a00;
-		else { /* ADC gain */
-			if (adc_vol_flag)
-				ctl = p->max - (((0x1e00 - regvalue) & 0xffff) / interval_offset);
-			else
-				ctl = p->max - (((0 - regvalue) & 0xffff) / interval_offset);
-		}
+		else /* ADC gain */
+			ctl = p->max - (((0x1e00 - regvalue) & 0xffff) / interval_offset);
 
 		ucontrol->value.integer.value[i] = ctl;
 	}
Signature · 1 line
2.49.0
#1 lore raw

Le 07/05/2025 à 16:09, Colin Ian King a écrit :

Quoted 20 lines

There is an if/else check where the else part is executed if adc_vol_flag is true, this else path checks if adc_vol_flag is true (which is a redundant second check) and the if path is always taken. Remove the redundant check and remove the else path since that can never occur.

---
  sound/soc/codecs/rt712-sdca.c | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/codecs/rt712-sdca.c +0 -1
index 19d99b9d4ab2..570c2af1245d 100644
@@ -1065,12 +1065,8 @@ static int rt712_sdca_dmic_set_gain_get(struct snd_kcontrol *kcontrol,
 
  		if (!adc_vol_flag) /* boost gain */
  			ctl = regvalue / 0x0a00;
-		else { /* ADC gain */

sound/soc/codecs/rt712-sdca.c static int rt712_sdca_dmic_set_gain_get(struct snd_kcontrol *kcontrol, · line 1072

Quoted 10 lines
sound/soc/codecs/rt712-sdca.c +2 -5
-			if (adc_vol_flag)
-				ctl = p->max - (((0x1e00 - regvalue) & 0xffff) / interval_offset);
-			else
-				ctl = p->max - (((0 - regvalue) & 0xffff) / interval_offset);
-		}
+		else /* ADC gain */
+			ctl = p->max - (((0x1e00 - regvalue) & 0xffff) / interval_offset);
 
  		ucontrol->value.integer.value[i] = ctl;
  	}

Hi,

apparently the same pattern is in rt712-sdca-dmic.c.

CJ

maintainer
#2 lore raw
In reply to Colin Ian King
Quoted 8 lines · Colin Ian King

There is an if/else check where the else part is executed if adc_vol_flag is true, this else path checks if adc_vol_flag is true (which is a redundant second check) and the if path is always taken. Remove the redundant check and remove the else path since that can never occur.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: rt712-sdca: remove redundant else path of if statement

      commit: 8147e75bd5f0977f6d389f6cdb4f10956cc3d88f

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark