lkml.org 
[lkml]   [2012]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] Simplify function kobject_init().
Date
From: Dong Hao <haodong@linux.vnet.ibm.com>

The function printk() at end of function kobject_init() already had '\n',
so remove it.

While the kobject has been initialized, assign error string and
jump to error case directly.

Signed-off-by: Dong Hao<haodong@linux.vnet.ibm.com>
---
lib/kobject.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index c33d7a1..ef3d807 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -276,14 +276,13 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype)
goto error;
}
if (!ktype) {
- err_str = "must have a ktype to be initialized properly!\n";
+ err_str = "must have a ktype to be initialized properly!";
goto error;
}
if (kobj->state_initialized) {
- /* do not error out as sometimes we can recover */
- printk(KERN_ERR "kobject (%p): tried to init an initialized "
- "object, something is seriously wrong.\n", kobj);
- dump_stack();
+ err_str = "tried to init an initialized "
+ "object, something is seriously wrong.";
+ goto error;
}

kobject_init_internal(kobj);
--
1.7.2.5


\
 
 \ /
  Last update: 2012-07-16 12:21    [W:0.020 / U:0.952 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site