kobj->parent is changed only when it is NULL originally.

This patch moves the assignment in the "if" to avoid unnecessary assignment.

Signed-off-by: Wei Yang <weiy...@linux.vnet.ibm.com>
---
 lib/kobject.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index 03d4ab3..37b10bb 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -216,9 +216,8 @@ static int kobject_add_internal(struct kobject *kobj)
        /* join kset if set, use it as parent if we do not already have one */
        if (kobj->kset) {
                if (!parent)
-                       parent = kobject_get(&kobj->kset->kobj);
+                       parent = kobj->parent = kobject_get(&kobj->kset->kobj);
                kobj_kset_join(kobj);
-               kobj->parent = parent;
        }
 
        pr_debug("kobject: '%s' (%p): %s: parent: '%s', set: '%s'\n",
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to