]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: max98088: use match_string() helper
authorXie Yisheng <xieyisheng1@huawei.com>
Thu, 31 May 2018 11:11:21 +0000 (19:11 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 31 May 2018 16:06:51 +0000 (17:06 +0100)
match_string() returns the index of an array for a matching string,
which can be used instead of open coded variant.

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>
sound/soc/codecs/max98088.c

index 865f64c40b79fe7cc1edaaefcb3ef47f3871f3f0..fb515aaa54fcd7796e132dc92fbbba1f2e4c6a06 100644 (file)
@@ -1382,15 +1382,12 @@ static const char *eq_mode_name[] = {"EQ1 Mode", "EQ2 Mode"};
 
 static int max98088_get_channel(struct snd_soc_component *component, const char *name)
 {
-       int i;
+       int ret;
 
-       for (i = 0; i < ARRAY_SIZE(eq_mode_name); i++)
-               if (strcmp(name, eq_mode_name[i]) == 0)
-                       return i;
-
-       /* Shouldn't happen */
-       dev_err(component->dev, "Bad EQ channel name '%s'\n", name);
-       return -EINVAL;
+       ret = match_string(eq_mode_name, ARRAY_SIZE(eq_mode_name), name);
+       if (ret < 0)
+               dev_err(component->dev, "Bad EQ channel name '%s'\n", name);
+       return ret;
 }
 
 static void max98088_setup_eq1(struct snd_soc_component *component)