[PATCH] driver-core: remove the duplicate assignment of kobj->parent in device_add

[Wei Yang]

kobject_add() will setup the kobject parent correctly.

This patch removes the redundant code.

Tested on Lenovo T420.

Signed-off-by: Wei Yang <weiyang@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Ram Pai <linuxram@xxxxxxxxxx>
Reviewed-by: Gavin Shan <shangw@xxxxxxxxxxxxxxxxxx>
---
 drivers/base/core.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 5e6e00b..37d0ea8 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -992,8 +992,6 @@ int device_add(struct device *dev)
 
 	parent = get_device(dev->parent);
 	kobj = get_device_parent(dev, parent);
-	if (kobj)
-		dev->kobj.parent = kobj;
 
 	/* use parent numa_node */
 	if (parent)
@@ -1001,7 +999,7 @@ int device_add(struct device *dev)
 
 	/* first, register with generic layer. */
 	/* we require the name to be set before, and pass NULL */
-	error = kobject_add(&dev->kobj, dev->kobj.parent, NULL);
+	error = kobject_add(&dev->kobj, kobj, NULL);
 	if (error)
 		goto Error;
 
-- 
1.7.5.4

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