]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: max98095: use match_string() helper
authorXie Yisheng <xieyisheng1@huawei.com>
Thu, 31 May 2018 11:11:22 +0000 (19:11 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 31 May 2018 16:07:03 +0000 (17:07 +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/max98095.c

index 6bf2d0ba864f9f222ffbc1d50cba365660dc986f..3b3a10da7f40892f86bfe7b0f85676b46ea1e2a8 100644 (file)
@@ -1634,15 +1634,12 @@ static const char *bq_mode_name[] = {"Biquad1 Mode", "Biquad2 Mode"};
 static int max98095_get_bq_channel(struct snd_soc_component *component,
                                   const char *name)
 {
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(bq_mode_name); i++)
-               if (strcmp(name, bq_mode_name[i]) == 0)
-                       return i;
+       int ret;
 
-       /* Shouldn't happen */
-       dev_err(component->dev, "Bad biquad channel name '%s'\n", name);
-       return -EINVAL;
+       ret = match_string(bq_mode_name, ARRAY_SIZE(bq_mode_name), name);
+       if (ret < 0)
+               dev_err(component->dev, "Bad biquad channel name '%s'\n", name);
+       return ret;
 }
 
 static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,