[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1526903890-35761-29-git-send-email-xieyisheng1@huawei.com>
Date: Mon, 21 May 2018 19:58:05 +0800
From: Yisheng Xie <xieyisheng1@...wei.com>
To: <linux-kernel@...r.kernel.org>
CC: Yisheng Xie <xieyisheng1@...wei.com>,
Clemens Ladisch <clemens@...isch.de>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Takashi Sakamoto <o-takashi@...amocchi.jp>,
<alsa-devel@...a-project.org>
Subject: [PATCH 28/33] ALSA: dice 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.
Cc: Clemens Ladisch <clemens@...isch.de>
Cc: Jaroslav Kysela <perex@...ex.cz>
Cc: Takashi Iwai <tiwai@...e.com>
Cc: Takashi Sakamoto <o-takashi@...amocchi.jp>
Cc: alsa-devel@...a-project.org
Signed-off-by: Yisheng Xie <xieyisheng1@...wei.com>
---
sound/firewire/dice/dice.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c
index 96bb01b..0639074 100644
--- a/sound/firewire/dice/dice.c
+++ b/sound/firewire/dice/dice.c
@@ -35,19 +35,13 @@ static bool force_two_pcm_support(struct fw_unit *unit)
"SAFFIRE_PRO_40_1",
};
char model[32];
- unsigned int i;
int err;
err = fw_csr_string(unit->directory, CSR_MODEL, model, sizeof(model));
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 check_dice_category(struct fw_unit *unit)
--
1.7.12.4
Powered by blists - more mailing lists