[PATCH] lib/kobject: simplify function kobject_init

[PATCH] lib/kobject: simplify function kobject_init

[Dong Hao]

From: Hao Dong <haodong@linux.vnet.ibm.com> 

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

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 |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index c6e201a..cab2fc9 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.9.5

Re: [PATCH] lib/kobject: simplify function kobject_init

[Cong Wang]

On Thu, Jul 5, 2012 at 3:58 PM, Dong Hao <haodong@linux.vnet.ibm.com> wrote:
>         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;

You missed the comment:

   /* do not error out as sometimes we can recover */