lkml.org 
[lkml]   [2018]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH][next][RESEND] drivers: base: remove need for a temporary string for the node name
Date
From: Colin Ian King <colin.king@canonical.com>

Currently the node name is being formatting into a temporary string
node_name, however, kobject_init_and_add allows one to format up
a node name, so use that instead. This removes the need for the
node_name string and also cleans up the following warning:

Fixes clang warning:
warning: format string is not a string literal (potentially
insecure) [-Wformat-security]

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/base/swnode.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 9c63ec8d8ab4..306bb93287af 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -553,7 +553,6 @@ fwnode_create_software_node(const struct property_entry *properties,
{
struct software_node *p = NULL;
struct software_node *swnode;
- char node_name[20];
int ret;

if (parent) {
@@ -576,8 +575,6 @@ fwnode_create_software_node(const struct property_entry *properties,
}

swnode->id = ret;
- sprintf(node_name, "node%d", swnode->id);
-
swnode->kobj.kset = swnode_kset;
swnode->fwnode.ops = &software_node_ops;

@@ -590,7 +587,7 @@ fwnode_create_software_node(const struct property_entry *properties,
list_add_tail(&swnode->entry, &p->children);

ret = kobject_init_and_add(&swnode->kobj, &software_node_type,
- p ? &p->kobj : NULL, node_name);
+ p ? &p->kobj : NULL, "node%d", swnode->id);
if (ret) {
kobject_put(&swnode->kobj);
return ERR_PTR(ret);
--
2.19.1
\
 
 \ /
  Last update: 2018-12-06 18:06    [W:0.028 / U:3.808 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site