summaryrefslogtreecommitdiff
path: root/drivers/net/phy/mdio_bus.c
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 /drivers/net/phy/mdio_bus.c
parentb67fda9a8280b14d44712d2ad6413e0074b070b8 (diff)
parent7e33d84db1a8a6c3000e9b02c074c17819680755 (diff)
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 'drivers/net/phy/mdio_bus.c')
-rw-r--r--drivers/net/phy/mdio_bus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 24665670a89a..53f034fc2ef7 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -459,8 +459,7 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus,
continue;
if (addr == mdiodev->addr) {
- dev->of_node = child;
- dev->fwnode = of_fwnode_handle(child);
+ device_set_node(dev, of_fwnode_handle(child));
return;
}
}