Unverified Commit f9e0b4af authored May 31, 2018 by Xie Yisheng Committed by Mark Brown May 31, 2018

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>

parent 1567062f

sound/soc/soc-dapm.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -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]))) {
		i = match_string(e->texts, e->items, control_name);
		if (i < 0)
		return -ENODEV;

		path->name = e->texts[i];
		if (i == item)
		path->connect = 1;
		else
		path->connect = 0;
		path->connect = (i == item);
		return 0;
		}
		}

		return -ENODEV;
		}

		/* set up initial codec paths */