From: Wei Yang <weiyang@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org,
joe@perches.com
Cc: shangw@linux.vnet.ibm.com, linuxram@us.ibm.com,
Wei Yang <weiyang@linux.vnet.ibm.com>
Subject: [PATCH 2/2] driver-core: remove the duplicate assignment of kobj->parent in device_add
Date: Thu, 7 Mar 2013 10:22:46 +0800 [thread overview]
Message-ID: <1362622966-20003-3-git-send-email-weiyang@linux.vnet.ibm.com> (raw)
In-Reply-To: <1362622966-20003-1-git-send-email-weiyang@linux.vnet.ibm.com>
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
next prev parent reply other threads:[~2013-03-07 2:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 2:22 [PATCH 0/2] Some cleanup in driver core Wei Yang
2013-03-07 2:22 ` [PATCH 1/2] driver core: remove device_add_attrs() in drivers/base/bus.c Wei Yang
2013-03-19 0:18 ` Greg KH
2013-03-19 2:08 ` Wei Yang
2013-03-07 2:22 ` Wei Yang [this message]
2013-03-07 11:33 ` [PATCH 2/2] driver-core: remove the duplicate assignment of kobj->parent in device_add Bjørn Mork
[not found] ` <20130307135032.GA6100@richard.(null)>
2013-03-07 14:49 ` Bjørn Mork
2013-03-19 0:17 ` [PATCH 0/2] Some cleanup in driver core Greg KH
2013-03-19 2:11 ` Wei Yang
[not found] <20130307152244.GA15616@weiyang.vnet.ibm.com>
2013-03-16 1:14 ` [PATCH 2/2] driver-core: remove the duplicate assignment of kobj->parent in device_add Wei Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362622966-20003-3-git-send-email-weiyang@linux.vnet.ibm.com \
--to=weiyang@linux.vnet.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxram@us.ibm.com \
--cc=shangw@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox