From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Mayer Subject: [PATCH v4 2/7] drm/nouveau/core: make use of new strlcpytolower() function Date: Fri, 22 Jul 2016 16:31:04 -0700 Message-ID: <1469230269-1644-3-git-send-email-mmayer@broadcom.com> References: <1469230269-1644-1-git-send-email-mmayer@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1469230269-1644-1-git-send-email-mmayer-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ben Skeggs , David Airlie , Alexandre Courbot Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: nouveau.vger.kernel.org Q2FsbCBzdHJsY3B5dG9sb3dlcigpIHJhdGhlciB0aGFuIGNvcHlpbmcgdGhlIHN0cmluZyBleHBs aWNpdGx5IGFuZAp0aGVuIHdhbGtpbmcgaXQgdG8gY29udmVydCBpdCB0byBsb3dlcmNhc2UuCgpT aWduZWQtb2ZmLWJ5OiBNYXJrdXMgTWF5ZXIgPG1tYXllckBicm9hZGNvbS5jb20+Ci0tLQoKVGhl IHNlbWFudGljcyBvZiB0aGUgbmV3IGZ1bmN0aW9uIGhhcyBjaGFuZ2VkLCBzbyB0aGlzIHBhdGNo IGhhcyBiZWVuCnVwZGF0ZWQgc2luY2UgdjIgdG8gbWF0Y2ggdGhlIG5ldyBzdHJsY3B5KCkgc2Vt YW50aWNzIChubyBleHBsaWNpdCBOVUxMCnRlcm1pbmF0aW5nIGlzIHJlcXVpcmVkKS4KClNlZSBo dHRwczovL3BhdGNod29yay5rZXJuZWwub3JnL3BhdGNoLzkyMTUyMDcvIGZvciB0aGUgcHJldmlv dXMgdmVyc2lvbi4KCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2NvcmUvZmlybXdhcmUu YyB8IDkgKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDggZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9jb3JlL2Zp cm13YXJlLmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2NvcmUvZmlybXdhcmUuYwpp bmRleCAzNGVjZDRhLi45ODI2MDFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9udmttL2NvcmUvZmlybXdhcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmtt L2NvcmUvZmlybXdhcmUuYwpAQCAtMzYsMTYgKzM2LDkgQEAgbnZrbV9maXJtd2FyZV9nZXQoc3Ry dWN0IG52a21fZGV2aWNlICpkZXZpY2UsIGNvbnN0IGNoYXIgKmZ3bmFtZSwKIHsKIAljaGFyIGZb NjRdOwogCWNoYXIgY25hbWVbMTZdOwotCWludCBpOwogCiAJLyogQ29udmVydCBkZXZpY2UgbmFt ZSB0byBsb3dlcmNhc2UgKi8KLQlzdHJuY3B5KGNuYW1lLCBkZXZpY2UtPmNoaXAtPm5hbWUsIHNp emVvZihjbmFtZSkpOwotCWNuYW1lW3NpemVvZihjbmFtZSkgLSAxXSA9ICdcMCc7Ci0JaSA9IHN0 cmxlbihjbmFtZSk7Ci0Jd2hpbGUgKGkpIHsKLQkJLS1pOwotCQljbmFtZVtpXSA9IHRvbG93ZXIo Y25hbWVbaV0pOwotCX0KKwlzdHJsY3B5dG9sb3dlcihjbmFtZSwgZGV2aWNlLT5jaGlwLT5uYW1l LCBzaXplb2YoY25hbWUpKTsKIAogCXNucHJpbnRmKGYsIHNpemVvZihmKSwgIm52aWRpYS8lcy8l cy5iaW4iLCBjbmFtZSwgZnduYW1lKTsKIAlyZXR1cm4gcmVxdWVzdF9maXJtd2FyZShmdywgZiwg ZGV2aWNlLT5kZXYpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZlYXVAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v bm91dmVhdQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752734AbcGVXcn (ORCPT ); Fri, 22 Jul 2016 19:32:43 -0400 Received: from mail-qk0-f178.google.com ([209.85.220.178]:33812 "EHLO mail-qk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751683AbcGVXcl (ORCPT ); Fri, 22 Jul 2016 19:32:41 -0400 From: Markus Mayer To: Ben Skeggs , David Airlie , Alexandre Courbot Cc: Markus Mayer , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/7] drm/nouveau/core: make use of new strlcpytolower() function Date: Fri, 22 Jul 2016 16:31:04 -0700 Message-Id: <1469230269-1644-3-git-send-email-mmayer@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469230269-1644-1-git-send-email-mmayer@broadcom.com> References: <1469230269-1644-1-git-send-email-mmayer@broadcom.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Call strlcpytolower() rather than copying the string explicitly and then walking it to convert it to lowercase. Signed-off-by: Markus Mayer --- The semantics of the new function has changed, so this patch has been updated since v2 to match the new strlcpy() semantics (no explicit NULL terminating is required). See https://patchwork.kernel.org/patch/9215207/ for the previous version. drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c index 34ecd4a..982601e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c @@ -36,16 +36,9 @@ nvkm_firmware_get(struct nvkm_device *device, const char *fwname, { char f[64]; char cname[16]; - int i; /* Convert device name to lowercase */ - strncpy(cname, device->chip->name, sizeof(cname)); - cname[sizeof(cname) - 1] = '\0'; - i = strlen(cname); - while (i) { - --i; - cname[i] = tolower(cname[i]); - } + strlcpytolower(cname, device->chip->name, sizeof(cname)); snprintf(f, sizeof(f), "nvidia/%s/%s.bin", cname, fwname); return request_firmware(fw, f, device->dev); -- 2.7.4