]> err.no Git - linux-2.6/commitdiff
kobject: kobject_put cleanup
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>
Tue, 2 Jan 2007 12:44:44 +0000 (13:44 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Feb 2007 18:37:13 +0000 (10:37 -0800)
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>
lib/kobject.c

index c033dc8fa9af8ad784605aa6acd5fd85cdca7277..74b8dbca150e39659d6f706d6c7e8668e9848eb4 100644 (file)
@@ -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)