From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753202AbeEUMK4 (ORCPT ); Mon, 21 May 2018 08:10:56 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:7717 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753025AbeEUMJ1 (ORCPT ); Mon, 21 May 2018 08:09:27 -0400 From: Yisheng Xie To: CC: Yisheng Xie , Clemens Ladisch , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto , Subject: [PATCH 28/33] ALSA: dice use match_string() helper Date: Mon, 21 May 2018 19:58:05 +0800 Message-ID: <1526903890-35761-29-git-send-email-xieyisheng1@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com> References: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org match_string() returns the index of an array for a matching string, which can be used intead of open coded variant. Cc: Clemens Ladisch Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Takashi Sakamoto Cc: alsa-devel@alsa-project.org Signed-off-by: Yisheng Xie --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yisheng Xie Subject: [PATCH 28/33] ALSA: dice use match_string() helper Date: Mon, 21 May 2018 19:58:05 +0800 Message-ID: <1526903890-35761-29-git-send-email-xieyisheng1@huawei.com> References: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by alsa0.perex.cz (Postfix) with ESMTP id F2BE126762F for ; Mon, 21 May 2018 14:09:30 +0200 (CEST) In-Reply-To: <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: linux-kernel@vger.kernel.org Cc: Yisheng Xie , alsa-devel@alsa-project.org, Clemens Ladisch , Takashi Iwai , Takashi Sakamoto List-Id: alsa-devel@alsa-project.org match_string() returns the index of an array for a matching string, which can be used intead of open coded variant. Cc: Clemens Ladisch Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Takashi Sakamoto Cc: alsa-devel@alsa-project.org Signed-off-by: Yisheng Xie --- 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