lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kobject: do not copy vargs, just pass them around

Browse Source 
This prevents a few unneeded copies.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers
2008-04-30 02:06:29 +02:00
committed by Greg Kroah-Hartman
parent 1cbfb7a5ac
commit a4ca661742
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/kobject.c
View File

@@ -216,21 +216,12 @@ static int kobject_add_internal(struct kobject *kobj)
static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
va_list vargs) va_list vargs)
{ {
va_list aq;
char *name;
va_copy(aq, vargs);
name = kvasprintf(GFP_KERNEL, fmt, vargs);
va_end(aq);
if (!name)
return -ENOMEM;
/* Free the old name, if necessary. */ /* Free the old name, if necessary. */
kfree(kobj->name); kfree(kobj->name);
/* Now, set the new name */ kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
kobj->name = name; if (!kobj->name)
return -ENOMEM;
return 0; return 0;
} }
@@ -246,12 +237,12 @@ static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
*/ */
int kobject_set_name(struct kobject *kobj, const char *fmt, ...) int kobject_set_name(struct kobject *kobj, const char *fmt, ...)
{ {
va_list args; va_list vargs;
int retval; int retval;
va_start(args, fmt); va_start(vargs, fmt);
retval = kobject_set_name_vargs(kobj, fmt, args); retval = kobject_set_name_vargs(kobj, fmt, vargs);
va_end(args); va_end(vargs);
return retval; return retval;
} }
@@ -301,12 +292,9 @@ EXPORT_SYMBOL(kobject_init);
static int kobject_add_varg(struct kobject *kobj, struct kobject *parent, static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
const char *fmt, va_list vargs) const char *fmt, va_list vargs)
{ {
va_list aq;
int retval; int retval;
va_copy(aq, vargs); retval = kobject_set_name_vargs(kobj, fmt, vargs);
retval = kobject_set_name_vargs(kobj, fmt, aq);
va_end(aq);
if (retval) { if (retval) {
printk(KERN_ERR "kobject: can not set name properly!\n"); printk(KERN_ERR "kobject: can not set name properly!\n");
return retval; return retval;