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>

diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index 9b6cab6154e084eab34ca12b9aa86315f2114be0..64ebcb6d235cc0b314c1d0dab5f96e31b8c48242 100644 (file)
--- 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);

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 4a30757c4ff84c8462fdac8116b58139ad3f87c0..6cf73c15635bcf9f546e747549f9e4aa61679ce5 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -787,9 +787,6 @@ void mdiobus_unregister(struct mii_bus *bus)
                gpiod_set_value_cansleep(bus->reset_gpiod, 1);
 
        device_del(&bus->dev);
-
-       if (bus->__unregister_callback)
-               bus->__unregister_callback(bus);
 }
 EXPORT_SYMBOL(mdiobus_unregister);
 

diff --git a/include/linux/phy.h b/include/linux/phy.h
index ac22b8e28a853af5c3b0f8b40f450089472ce65b..6cb9d843aee93279e9196f981555f6b7c2a8a979 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -434,9 +434,6 @@ struct mii_bus {
 
        /** @shared: shared state across different PHYs */
        struct phy_package_shared *shared[PHY_MAX_ADDR];
-
-       /** @__unregister_callback: called at the last step of unregistration */
-       void (*__unregister_callback)(struct mii_bus *bus);
 };
 #define to_mii_bus(d) container_of(d, struct mii_bus, dev)