summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXie Yisheng <xieyisheng1@huawei.com>2018-05-31 19:11:23 +0800
committerMark Brown <broonie@kernel.org>2018-05-31 17:07:07 +0100
commitf9e0b4afd4e9b19e95158962d81b5b776d57ca06 (patch)
tree8d615c71409e29f97ea33e71f6480b27559d2470
parent1567062f17284637519d004ecc5d7ea0d6c754c3 (diff)
downloadlinux-f9e0b4afd4e9b19e95158962d81b5b776d57ca06.tar.bz2
ASoC: dapm: use match_string() helper
match_string() returns the index of an array for a matching string, which can be used instead of open coded variant. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/soc-dapm.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2d9709104ec5..1e9a36389667 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -724,18 +724,14 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm,
item = 0;
}
- for (i = 0; i < e->items; i++) {
- if (!(strcmp(control_name, e->texts[i]))) {
- path->name = e->texts[i];
- if (i == item)
- path->connect = 1;
- else
- path->connect = 0;
- return 0;
- }
- }
+ i = match_string(e->texts, e->items, control_name);
+ if (i < 0)
+ return -ENODEV;
+
+ path->name = e->texts[i];
+ path->connect = (i == item);
+ return 0;
- return -ENODEV;
}
/* set up initial codec paths */