From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755153AbeEaLZX (ORCPT ); Thu, 31 May 2018 07:25:23 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:8228 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754758AbeEaLWn (ORCPT ); Thu, 31 May 2018 07:22:43 -0400 From: Yisheng Xie To: CC: , Yisheng Xie , "Ben Skeggs" , David Airlie , , Subject: [PATCH v2 11/21] drm/nouveau: use match_string() helper Date: Thu, 31 May 2018 19:11:16 +0800 Message-ID: <1527765086-19873-12-git-send-email-xieyisheng1@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1527765086-19873-1-git-send-email-xieyisheng1@huawei.com> References: <1527765086-19873-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 instead of open coded variant. Cc: Ben Skeggs Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Signed-off-by: Yisheng Xie --- v2: - handle err case before normal case - per Andy drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 6d99f11..67ba2ac 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -644,16 +644,13 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, int i; if (nouveau_tv_norm) { - for (i = 0; i < num_tv_norms; i++) { - if (!strcmp(nv17_tv_norm_names[i], nouveau_tv_norm)) { - tv_enc->tv_norm = i; - break; - } - } - - if (i == num_tv_norms) + i = match_string(nv17_tv_norm_names, + num_tv_norms, nouveau_tv_norm); + if (i < 0) NV_WARN(drm, "Invalid TV norm setting \"%s\"\n", nouveau_tv_norm); + else + tv_enc->tv_norm = i; } drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); -- 1.7.12.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yisheng Xie Subject: [PATCH v2 11/21] drm/nouveau: use match_string() helper Date: Thu, 31 May 2018 19:11:16 +0800 Message-ID: <1527765086-19873-12-git-send-email-xieyisheng1@huawei.com> References: <1527765086-19873-1-git-send-email-xieyisheng1@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1527765086-19873-1-git-send-email-xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Yisheng Xie , David Airlie , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Ben Skeggs List-Id: nouveau.vger.kernel.org bWF0Y2hfc3RyaW5nKCkgcmV0dXJucyB0aGUgaW5kZXggb2YgYW4gYXJyYXkgZm9yIGEgbWF0Y2hp bmcgc3RyaW5nLAp3aGljaCBjYW4gYmUgdXNlZCBpbnN0ZWFkIG9mIG9wZW4gY29kZWQgdmFyaWFu dC4KCkNjOiBCZW4gU2tlZ2dzIDxic2tlZ2dzQHJlZGhhdC5jb20+CkNjOiBEYXZpZCBBaXJsaWUg PGFpcmxpZWRAbGludXguaWU+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNj OiBub3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpTaWduZWQtb2ZmLWJ5OiBZaXNoZW5nIFhp ZSA8eGlleWlzaGVuZzFAaHVhd2VpLmNvbT4KLS0tCnYyOgogLSBoYW5kbGUgZXJyIGNhc2UgYmVm b3JlIG5vcm1hbCBjYXNlIC0gcGVyIEFuZHkKCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNw bnYwNC90dm52MTcuYyB8IDEzICsrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2Vy dGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25v dXZlYXUvZGlzcG52MDQvdHZudjE3LmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNwbnYw NC90dm52MTcuYwppbmRleCA2ZDk5ZjExLi42N2JhMmFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9kaXNwbnYwNC90dm52MTcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9kaXNwbnYwNC90dm52MTcuYwpAQCAtNjQ0LDE2ICs2NDQsMTMgQEAgc3RhdGljIGludCBu djE3X3R2X2NyZWF0ZV9yZXNvdXJjZXMoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAogCWlu dCBpOwogCiAJaWYgKG5vdXZlYXVfdHZfbm9ybSkgewotCQlmb3IgKGkgPSAwOyBpIDwgbnVtX3R2 X25vcm1zOyBpKyspIHsKLQkJCWlmICghc3RyY21wKG52MTdfdHZfbm9ybV9uYW1lc1tpXSwgbm91 dmVhdV90dl9ub3JtKSkgewotCQkJCXR2X2VuYy0+dHZfbm9ybSA9IGk7Ci0JCQkJYnJlYWs7Ci0J CQl9Ci0JCX0KLQotCQlpZiAoaSA9PSBudW1fdHZfbm9ybXMpCisJCWkgPSBtYXRjaF9zdHJpbmco bnYxN190dl9ub3JtX25hbWVzLAorCQkJCSBudW1fdHZfbm9ybXMsIG5vdXZlYXVfdHZfbm9ybSk7 CisJCWlmIChpIDwgMCkKIAkJCU5WX1dBUk4oZHJtLCAiSW52YWxpZCBUViBub3JtIHNldHRpbmcg XCIlc1wiXG4iLAogCQkJCW5vdXZlYXVfdHZfbm9ybSk7CisJCWVsc2UKKwkJCXR2X2VuYy0+dHZf bm9ybSA9IGk7CiAJfQogCiAJZHJtX21vZGVfY3JlYXRlX3R2X3Byb3BlcnRpZXMoZGV2LCBudW1f dHZfbm9ybXMsIG52MTdfdHZfbm9ybV9uYW1lcyk7Ci0tIAoxLjcuMTIuNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWlsaW5nIGxpc3QK Tm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==