From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 25 Feb 2016 07:47:10 +0000 Subject: [patch] drm/amd: cleanup get_mfd_cell_dev() Message-Id: <20160225074709.GA7333@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie Cc: Maruthi Srinivas Bayyavarapu , Jammy Zhou , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , Murali Krishna Vemuri It's simpler to just use snprintf() to print this to one buffer instead of using strcpy() and strcat(). Also using snprintf() is slightly safer than using sprintf(). Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c index 9f8cfaa..d6b0bff 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c @@ -240,12 +240,10 @@ static int acp_poweron(struct generic_pm_domain *genpd) static struct device *get_mfd_cell_dev(const char *device_name, int r) { char auto_dev_name[25]; - char buf[8]; struct device *dev; - sprintf(buf, ".%d.auto", r); - strcpy(auto_dev_name, device_name); - strcat(auto_dev_name, buf); + snprintf(auto_dev_name, sizeof(auto_dev_name), + "%s.%d.auto", device_name, r); dev = bus_find_device_by_name(&platform_bus_type, NULL, auto_dev_name); dev_info(dev, "device %s added to pm domain\n", auto_dev_name); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/amd: cleanup get_mfd_cell_dev() Date: Thu, 25 Feb 2016 10:47:10 +0300 Message-ID: <20160225074709.GA7333@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id 687786E952 for ; Thu, 25 Feb 2016 07:47:27 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: Maruthi Srinivas Bayyavarapu , Jammy Zhou , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , Murali Krishna Vemuri List-Id: dri-devel@lists.freedesktop.org SXQncyBzaW1wbGVyIHRvIGp1c3QgdXNlIHNucHJpbnRmKCkgdG8gcHJpbnQgdGhpcyB0byBvbmUg YnVmZmVyIGluc3RlYWQKb2YgdXNpbmcgc3RyY3B5KCkgYW5kIHN0cmNhdCgpLiAgQWxzbyB1c2lu ZyBzbnByaW50ZigpIGlzIHNsaWdodGx5IHNhZmVyCnRoYW4gdXNpbmcgc3ByaW50ZigpLgoKU2ln bmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hY3AuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hY3AuYwppbmRleCA5ZjhjZmFhLi5kNmIwYmZm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYWNwLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FjcC5jCkBAIC0yNDAsMTIgKzI0 MCwxMCBAQCBzdGF0aWMgaW50IGFjcF9wb3dlcm9uKHN0cnVjdCBnZW5lcmljX3BtX2RvbWFpbiAq Z2VucGQpCiBzdGF0aWMgc3RydWN0IGRldmljZSAqZ2V0X21mZF9jZWxsX2Rldihjb25zdCBjaGFy ICpkZXZpY2VfbmFtZSwgaW50IHIpCiB7CiAJY2hhciBhdXRvX2Rldl9uYW1lWzI1XTsKLQljaGFy IGJ1Zls4XTsKIAlzdHJ1Y3QgZGV2aWNlICpkZXY7CiAKLQlzcHJpbnRmKGJ1ZiwgIi4lZC5hdXRv Iiwgcik7Ci0Jc3RyY3B5KGF1dG9fZGV2X25hbWUsIGRldmljZV9uYW1lKTsKLQlzdHJjYXQoYXV0 b19kZXZfbmFtZSwgYnVmKTsKKwlzbnByaW50ZihhdXRvX2Rldl9uYW1lLCBzaXplb2YoYXV0b19k ZXZfbmFtZSksCisJCSAiJXMuJWQuYXV0byIsIGRldmljZV9uYW1lLCByKTsKIAlkZXYgPSBidXNf ZmluZF9kZXZpY2VfYnlfbmFtZSgmcGxhdGZvcm1fYnVzX3R5cGUsIE5VTEwsIGF1dG9fZGV2X25h bWUpOwogCWRldl9pbmZvKGRldiwgImRldmljZSAlcyBhZGRlZCB0byBwbSBkb21haW5cbiIsIGF1 dG9fZGV2X25hbWUpOwogCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760117AbcBYHrs (ORCPT ); Thu, 25 Feb 2016 02:47:48 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:48986 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759164AbcBYHr2 (ORCPT ); Thu, 25 Feb 2016 02:47:28 -0500 Date: Thu, 25 Feb 2016 10:47:10 +0300 From: Dan Carpenter To: David Airlie Cc: Alex Deucher , Maruthi Srinivas Bayyavarapu , Jammy Zhou , Murali Krishna Vemuri , Chunming Zhou , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] drm/amd: cleanup get_mfd_cell_dev() Message-ID: <20160225074709.GA7333@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's simpler to just use snprintf() to print this to one buffer instead of using strcpy() and strcat(). Also using snprintf() is slightly safer than using sprintf(). Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c index 9f8cfaa..d6b0bff 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c @@ -240,12 +240,10 @@ static int acp_poweron(struct generic_pm_domain *genpd) static struct device *get_mfd_cell_dev(const char *device_name, int r) { char auto_dev_name[25]; - char buf[8]; struct device *dev; - sprintf(buf, ".%d.auto", r); - strcpy(auto_dev_name, device_name); - strcat(auto_dev_name, buf); + snprintf(auto_dev_name, sizeof(auto_dev_name), + "%s.%d.auto", device_name, r); dev = bus_find_device_by_name(&platform_bus_type, NULL, auto_dev_name); dev_info(dev, "device %s added to pm domain\n", auto_dev_name);