net: mdio: use device_set_node() to setup both fwnode and of

Use the newly introduced helper to setup both the of_node and the
fwnode for a given device.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c
index 283ddb1185bd6f64c62c92f2959aa5a370f848db..1becb1a731f67555fc44e099bd90ee432086203c 100644 (file)
--- a/drivers/net/mdio/fwnode_mdio.c
+++ b/drivers/net/mdio/fwnode_mdio.c
@@ -65,8 +65,7 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,
         * can be looked up later
         */
        fwnode_handle_get(child);
-       phy->mdio.dev.of_node = to_of_node(child);
-       phy->mdio.dev.fwnode = child;
+       device_set_node(&phy->mdio.dev, child);
 
        /* All data is now stored in the phy struct;
         * register it

diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index 8744b1e1c2b1cca6b91023e789b61f0437904e09..9e3c815a070f14c4c46f16b84dcfc705d9cd5865 100644 (file)
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -51,6 +51,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
 static int of_mdiobus_register_device(struct mii_bus *mdio,
                                      struct device_node *child, u32 addr)
 {
+       struct fwnode_handle *fwnode = of_fwnode_handle(child);
        struct mdio_device *mdiodev;
        int rc;
 
@@ -61,9 +62,8 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
        /* Associate the OF node with the device structure so it
         * can be looked up later.
         */
-       of_node_get(child);
-       mdiodev->dev.of_node = child;
-       mdiodev->dev.fwnode = of_fwnode_handle(child);
+       fwnode_handle_get(fwnode);
+       device_set_node(&mdiodev->dev, fwnode);
 
        /* All data is now stored in the mdiodev struct; register it. */
        rc = mdio_device_register(mdiodev);
@@ -162,8 +162,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
         * the device tree are populated after the bus has been registered */
        mdio->phy_mask = ~0;
 
-       mdio->dev.of_node = np;
-       mdio->dev.fwnode = of_fwnode_handle(np);
+       device_set_node(&mdio->dev, of_fwnode_handle(np));
 
        /* Get bus level PHY reset GPIO details */
        mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 24665670a89a757b8c4da031ba1edc824094ff07..53f034fc2ef7983527faa32fc7589e93eb8f04bc 100644 (file)
--- 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;
                }
        }