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>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2d9709104ec55e026322f50d58d52b41a0bba4be..1e9a36389667559b5f8aaddba0f59826d4324504 100644 (file)
--- 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 */