| Message ID | 20241008174122.4696-1-everestkc@everestkc.com.np (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: rt721-sdca: Clean logically deadcode in rt721-sdca.c | expand |
On 10/8/24 11:41, Everest K.C. wrote: > As the same condition was checked in inner and outer if > statements. The code never reaches the inner else statement. > Looks like this file is only on next. Use next in the prefix [PATCH-next] How did you find this problem? Include it in the change log. > Signed-off-by: Everest K.C. <everestkc@everestkc.com.np> > --- > sound/soc/codecs/rt721-sdca.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/codecs/rt721-sdca.c b/sound/soc/codecs/rt721-sdca.c > index 36056cb7a3ca..4fd26e490610 100644 > --- a/sound/soc/codecs/rt721-sdca.c > +++ b/sound/soc/codecs/rt721-sdca.c > @@ -611,13 +611,9 @@ static int rt721_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; > } > Looks reasonable to me. I don't see adc_vol_flag changing. Possible copy error from sound/soc/codecs/rt722-sdca.c Perhaps rt722-sdca.c came from sound/soc/codecs/rt712-sdca.c in which the logic seems to be correct. In any case, I will leave it to sound experts to comment whether this patch is correct or not. thanks, -- Shuah
diff --git a/sound/soc/codecs/rt721-sdca.c b/sound/soc/codecs/rt721-sdca.c index 36056cb7a3ca..4fd26e490610 100644 --- a/sound/soc/codecs/rt721-sdca.c +++ b/sound/soc/codecs/rt721-sdca.c @@ -611,13 +611,9 @@ static int rt721_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. Signed-off-by: Everest K.C. <everestkc@everestkc.com.np> --- sound/soc/codecs/rt721-sdca.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)