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

Wei Yang
2013-03-07T02:23:35Z

kobject_add() will setup the kobject parent correctly.

This patch removes the redundant code.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Reviewed-by: Ram Pai <linuxram@us.ibm.com>
Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com>
---
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 369ae4e..6b0a859 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1024,8 +1024,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)
@@ -1033,7 +1031,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