evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: dapm: Remove unnecessary loop

Browse source 
The condition 'i == item' is only true when, well, 'i' equals 'item'.
So just use 'item' directly as the index into the array.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2013-06-14 13:16:52 +02:00 • committed by Mark Brown
parent 6b75bf0c5b
commit 58fee775b7
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/soc-dapm.c
View file

@ -363,11 +363,10 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
val = soc_widget_read(w, e->reg); val = soc_widget_read(w, e->reg);
item = (val >> e->shift_l) & e->mask; item = (val >> e->shift_l) & e->mask;
p->connect = 0; if (item < e->max && !strcmp(p->name, e->texts[item]))
for (i = 0; i < e->max; i++) {
if (!(strcmp(p->name, e->texts[i])) && item == i)
p->connect = 1; p->connect = 1;
} else
p->connect = 0;
} }
break; break;
case snd_soc_dapm_virt_mux: { case snd_soc_dapm_virt_mux: {
@ -397,11 +396,10 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
break; break;
} }
p->connect = 0; if (item < e->max && !strcmp(p->name, e->texts[item]))
for (i = 0; i < e->max; i++) {
if (!(strcmp(p->name, e->texts[i])) && item == i)
p->connect = 1; p->connect = 1;
} else
p->connect = 0;
} }
break; break;
/* does not affect routing - always connected */ /* does not affect routing - always connected */