| Message ID | 20241010175017.5215-1-everestkc@everestkc.com.np (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: rt722-sdca: Remove logically deadcode in rt722-sdca.c | expand |
On 10/10/24 11:50, Everest K.C. wrote: > As the same condition was checked in inner and outer if statements. > The code never reaches the inner else statement. > Fix this by removing the logically dead inner else statement. > > Fixes: 7f5d6036ca00 ("ASoC: rt722-sdca: Add RT722 SDCA driver") > Reported-by: Shuah Khan <skhan@linuxfoundation.org> > Closes: https://lore.kernel.org/all/e44527e8-b7c6-4712-97a6-d54f02ad2dc9@linuxfoundation.org/ > Signed-off-by: Everest K.C. <everestkc@everestkc.com.np> > --- > sound/soc/codecs/rt722-sdca.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c > index e5bd9ef812de..f9f7512ca360 100644 > --- a/sound/soc/codecs/rt722-sdca.c > +++ b/sound/soc/codecs/rt722-sdca.c > @@ -607,12 +607,8 @@ static int rt722_sdca_dmic_set_gain_get(struct snd_kcontrol *kcontrol, > > if (!adc_vol_flag) /* boost gain */ > ctl = regvalue / boost_step; > - else { /* ADC gain */ > - if (adc_vol_flag) > - ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); > - else > - ctl = p->max - (((0 - regvalue) & 0xffff) / interval_offset); > - } > + else /* ADC gain */ > + ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); > > ucontrol->value.integer.value[i] = ctl; > } Thank you. Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c index e5bd9ef812de..f9f7512ca360 100644 --- a/sound/soc/codecs/rt722-sdca.c +++ b/sound/soc/codecs/rt722-sdca.c @@ -607,12 +607,8 @@ static int rt722_sdca_dmic_set_gain_get(struct snd_kcontrol *kcontrol, if (!adc_vol_flag) /* boost gain */ ctl = regvalue / boost_step; - else { /* ADC gain */ - if (adc_vol_flag) - ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); - else - ctl = p->max - (((0 - regvalue) & 0xffff) / interval_offset); - } + else /* ADC gain */ + ctl = p->max - (((vol_max - regvalue) & 0xffff) / interval_offset); ucontrol->value.integer.value[i] = ctl; }
As the same condition was checked in inner and outer if statements. The code never reaches the inner else statement. Fix this by removing the logically dead inner else statement. Fixes: 7f5d6036ca00 ("ASoC: rt722-sdca: Add RT722 SDCA driver") Reported-by: Shuah Khan <skhan@linuxfoundation.org> Closes: https://lore.kernel.org/all/e44527e8-b7c6-4712-97a6-d54f02ad2dc9@linuxfoundation.org/ Signed-off-by: Everest K.C. <everestkc@everestkc.com.np> --- sound/soc/codecs/rt722-sdca.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)