summaryrefslogtreecommitdiff
path: root/drivers/net/mdio
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-01-02 14:23:34 -0800
committerJakub Kicinski <kuba@kernel.org>2024-01-02 14:23:39 -0800
commit3e64db35bc37edbe9e37aaa987df92cde12ddb6c (patch)
treec83a9d7355a01ccc860609c03356170d26145136 /drivers/net/mdio
parent1e71017b6e12637db3d41bf18b15b76372837679 (diff)
Revert "net: mdio: get/put device node during (un)registration"
This reverts commit cff9c565e65f3622e8dc1dcc21c1520a083dff35. Revert based on feedback from Russell. Link: https://lore.kernel.org/all/ZZPtUIRerqTI2%2Fyh@shell.armlinux.org.uk/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/mdio')
-rw-r--r--drivers/net/mdio/of_mdio.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index 9b6cab6154e0..64ebcb6d235c 100644
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -139,11 +139,6 @@ bool of_mdiobus_child_is_phy(struct device_node *child)
}
EXPORT_SYMBOL(of_mdiobus_child_is_phy);
-static void __of_mdiobus_unregister_callback(struct mii_bus *mdio)
-{
- of_node_put(mdio->dev.of_node);
-}
-
/**
* __of_mdiobus_register - Register mii_bus and create PHYs from the device tree
* @mdio: pointer to mii_bus structure
@@ -171,8 +166,6 @@ 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->__unregister_callback = __of_mdiobus_unregister_callback;
- of_node_get(np);
device_set_node(&mdio->dev, of_fwnode_handle(np));
/* Get bus level PHY reset GPIO details */
@@ -184,7 +177,7 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
/* Register the MDIO bus */
rc = __mdiobus_register(mdio, owner);
if (rc)
- goto put_node;
+ return rc;
/* Loop over the child nodes and register a phy_device for each phy */
for_each_available_child_of_node(np, child) {
@@ -244,9 +237,6 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
unregister:
of_node_put(child);
mdiobus_unregister(mdio);
-
-put_node:
- of_node_put(np);
return rc;
}
EXPORT_SYMBOL(__of_mdiobus_register);