[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20171005194422.26224-6-robh@kernel.org>
Date: Thu, 5 Oct 2017 14:44:21 -0500
From: Rob Herring <robh@...nel.org>
To: linux-kernel@...r.kernel.org, devicetree@...r.kernel.org
Cc: Nicolas Pitre <nico@...aro.org>,
Frank Rowand <frowand.list@...il.com>,
Grant Likely <glikely@...retlab.ca>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: [PATCH 5/6] of: wrap accesses to device_node kobject
In preparation to make kobject element in struct device_node optional,
provide and use a macro to return the kobject pointer. The only user
outside the DT core is the driver core.
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Nicolas Pitre <nico@...aro.org>
Cc: Frank Rowand <frowand.list@...il.com>
Signed-off-by: Rob Herring <robh@...nel.org>
---
drivers/base/core.c | 2 +-
include/linux/of.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 12ebd055724c..c07b47059538 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1571,7 +1571,7 @@ static int device_add_class_symlinks(struct device *dev)
int error;
if (of_node) {
- error = sysfs_create_link(&dev->kobj, &of_node->kobj,"of_node");
+ error = sysfs_create_link(&dev->kobj, of_node_kobj(of_node), "of_node");
if (error)
dev_warn(dev, "Error %d creating of_node link\n",error);
/* An error here doesn't warrant bringing down the device */
diff --git a/include/linux/of.h b/include/linux/of.h
index 7eb94b7fbcf3..2d685e769409 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -111,6 +111,8 @@ static inline void of_node_init(struct device_node *node)
node->fwnode.ops = &of_fwnode_ops;
}
+#define of_node_kobj(n) (&(n)->kobj)
+
/* true when node is initialized */
static inline int of_node_is_initialized(struct device_node *node)
{
--
2.11.0
Powered by blists - more mailing lists