summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-06-17 12:06:53 -0700
committerDavid S. Miller <davem@davemloft.net>2021-06-17 12:06:53 -0700
commita31fcbceef37f7a502b8dc70e2c2767e68232e74 (patch)
tree2a88d859ace28417f566ffaa2b864c7da4e2100e /include/linux
parentb67fda9a8280b14d44712d2ad6413e0074b070b8 (diff)
parent7e33d84db1a8a6c3000e9b02c074c17819680755 (diff)
downloadcachepc-linux-a31fcbceef37f7a502b8dc70e2c2767e68232e74.tar.gz
cachepc-linux-a31fcbceef37f7a502b8dc70e2c2767e68232e74.zip
Merge branch 'mdio-nodes'
Ioana Ciornei says: ==================== net: mdio: setup both fwnode and of_node The first patch in this series fixes a bug introduced by mistake in the previous ACPI MDIO patch set. The next two patches are adding a new helper which takes a device and a fwnode_handle and populates both the of_node and fwnode so that we make sure that a bug like this does not happen anymore. Also, the new helper is used in the MDIO area. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 38a2071cf776..a1e7cab2c7bf 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -819,6 +819,7 @@ int device_online(struct device *dev);
void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode);
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)
{