summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>2007-01-02 13:44:44 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 10:37:13 -0800
commitb067db49e1f4013ef02ef68845701b600e88a722 (patch)
tree9b12ce952fada146afdfb638d72bf12af78aebfc /lib
parentf75065367077bd3b77842a5aa523ecd05d33e82d (diff)
downloadlinux-stable-b067db49e1f4013ef02ef68845701b600e88a722.tar.gz
linux-stable-b067db49e1f4013ef02ef68845701b600e88a722.tar.bz2
linux-stable-b067db49e1f4013ef02ef68845701b600e88a722.zip
kobject: kobject_put cleanup
This patch removes redundant argument checks for kobject_put(). Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/kobject.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index c033dc8fa9af..74b8dbca150e 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -195,8 +195,7 @@ int kobject_add(struct kobject * kobj)
if (error) {
/* unlink does the kobject_put() for us */
unlink(kobj);
- if (parent)
- kobject_put(parent);
+ kobject_put(parent);
/* be noisy on error issues */
if (error == -EEXIST)
@@ -420,8 +419,7 @@ void kobject_cleanup(struct kobject * kobj)
t->release(kobj);
if (s)
kset_put(s);
- if (parent)
- kobject_put(parent);
+ kobject_put(parent);
}
static void kobject_release(struct kref *kref)