diff options
author | Yisheng Xie <xieyisheng1@huawei.com> | 2018-05-21 13:58:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-05-22 09:25:42 +0200 |
commit | 2cc47d31ebf967cfca74045ac8fc9bb742f17ab3 (patch) | |
tree | 97a551a92d4005eae6f7b2dac7833e49f56a3f71 /sound/firewire | |
parent | Merge branch 'topic/xen' into for-next (diff) | |
download | linux-2cc47d31ebf967cfca74045ac8fc9bb742f17ab3.tar.xz linux-2cc47d31ebf967cfca74045ac8fc9bb742f17ab3.zip |
ALSA: oxfw: use match_string() helper
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r-- | sound/firewire/oxfw/oxfw.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c index 413ab6313bb6..1e5b2c802635 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -49,7 +49,6 @@ static bool detect_loud_models(struct fw_unit *unit) "Tapco LINK.firewire 4x6", "U.420"}; char model[32]; - unsigned int i; int err; err = fw_csr_string(unit->directory, CSR_MODEL, @@ -57,12 +56,7 @@ static bool detect_loud_models(struct fw_unit *unit) if (err < 0) return false; - for (i = 0; i < ARRAY_SIZE(models); i++) { - if (strcmp(models[i], model) == 0) - break; - } - - return (i < ARRAY_SIZE(models)); + return match_string(models, ARRAY_SIZE(models), model) >= 0; } static int name_card(struct snd_oxfw *oxfw) |