summaryrefslogtreecommitdiff
path: root/lib/kobject.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2004-02-26 19:18:21 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2004-02-26 19:18:21 -0800
commitf7d1fc56b47a5d74f3bb072899225f6e058f2862 (patch)
tree583f1d2d008c7fca305edf235947289d9c9c88b1 /lib/kobject.c
parent6d739c0468ab837f71c125b90f4fbf2b0062c01e (diff)
kobject: clean up kobject_get() convoluted logic.
Diffstat (limited to 'lib/kobject.c')
-rw-r--r--lib/kobject.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 4d3b617dbc9d..2430e2be81e3 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -425,14 +425,11 @@ void kobject_unregister(struct kobject * kobj)
struct kobject * kobject_get(struct kobject * kobj)
{
- struct kobject * ret = kobj;
-
if (kobj) {
WARN_ON(!atomic_read(&kobj->refcount));
atomic_inc(&kobj->refcount);
- } else
- ret = NULL;
- return ret;
+ }
+ return kobj;
}
/**