From: Dong Hao <haodong@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, shangw@linux.vnet.ibm.com,
haodong@linux.vnet.ibm.com
Subject: [PATCH] Simplify function kobject_init().
Date: Mon, 16 Jul 2012 17:41:28 +0800 [thread overview]
Message-ID: <1342431688-4836-1-git-send-email-haodong@linux.vnet.ibm.com> (raw)
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
reply other threads:[~2012-07-16 9:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342431688-4836-1-git-send-email-haodong@linux.vnet.ibm.com \
--to=haodong@linux.vnet.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shangw@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®