driver core: add a helper to setup both the of_node and fwnode of a device

[ Upstream commit acbf86295c3f7d7ecd1f9f29d77172f7aaf8ca68 ]

There are many places where both the fwnode_handle and the of_node of a
device need to be populated. Add a function which does both so that we
have consistency.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: a26cc2934331 ("drm/mipi-dsi: Set the fwnode for mipi_dsi_device")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 1b016fdd1a7504e9b1e2c604ef9712ead8fe0c38..f8e157ede44f838c46f4b890c92887f4f531bd97 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -3474,6 +3474,13 @@ void device_set_of_node_from_dev(struct device *dev, const struct device *dev2)
 }
 EXPORT_SYMBOL_GPL(device_set_of_node_from_dev);
 
+void device_set_node(struct device *dev, struct fwnode_handle *fwnode)
+{
+       dev->fwnode = fwnode;
+       dev->of_node = to_of_node(fwnode);
+}
+EXPORT_SYMBOL_GPL(device_set_node);
+
 int device_match_name(struct device *dev, const void *name)
 {
        return sysfs_streq(dev_name(dev), name);

diff --git a/include/linux/device.h b/include/linux/device.h
index 3414b5a67b466268edcaa6514fafdde0611f559b..d74275e2047a4dfc36e78b1cd4002b626cfca529 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1528,6 +1528,7 @@ extern int device_online(struct device *dev);
 extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode);
 extern void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode);
 void device_set_of_node_from_dev(struct device *dev, const struct device *dev2);
+void device_set_node(struct device *dev, struct fwnode_handle *fwnode);
 
 static inline int dev_num_vf(struct device *dev)
 {