Skip to content

Commit 3e64db3

Browse files
committed
Revert "net: mdio: get/put device node during (un)registration"
This reverts commit cff9c56. Revert based on feedback from Russell. Link: https://lore.kernel.org/all/ZZPtUIRerqTI2%[email protected]/ Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1e71017 commit 3e64db3

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

drivers/net/mdio/of_mdio.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ bool of_mdiobus_child_is_phy(struct device_node *child)
139139
}
140140
EXPORT_SYMBOL(of_mdiobus_child_is_phy);
141141

142-
static void __of_mdiobus_unregister_callback(struct mii_bus *mdio)
143-
{
144-
of_node_put(mdio->dev.of_node);
145-
}
146-
147142
/**
148143
* __of_mdiobus_register - Register mii_bus and create PHYs from the device tree
149144
* @mdio: pointer to mii_bus structure
@@ -171,8 +166,6 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
171166
* the device tree are populated after the bus has been registered */
172167
mdio->phy_mask = ~0;
173168

174-
mdio->__unregister_callback = __of_mdiobus_unregister_callback;
175-
of_node_get(np);
176169
device_set_node(&mdio->dev, of_fwnode_handle(np));
177170

178171
/* Get bus level PHY reset GPIO details */
@@ -184,7 +177,7 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
184177
/* Register the MDIO bus */
185178
rc = __mdiobus_register(mdio, owner);
186179
if (rc)
187-
goto put_node;
180+
return rc;
188181

189182
/* Loop over the child nodes and register a phy_device for each phy */
190183
for_each_available_child_of_node(np, child) {
@@ -244,9 +237,6 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
244237
unregister:
245238
of_node_put(child);
246239
mdiobus_unregister(mdio);
247-
248-
put_node:
249-
of_node_put(np);
250240
return rc;
251241
}
252242
EXPORT_SYMBOL(__of_mdiobus_register);

drivers/net/phy/mdio_bus.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,9 +787,6 @@ void mdiobus_unregister(struct mii_bus *bus)
787787
gpiod_set_value_cansleep(bus->reset_gpiod, 1);
788788

789789
device_del(&bus->dev);
790-
791-
if (bus->__unregister_callback)
792-
bus->__unregister_callback(bus);
793790
}
794791
EXPORT_SYMBOL(mdiobus_unregister);
795792

include/linux/phy.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,6 @@ struct mii_bus {
434434

435435
/** @shared: shared state across different PHYs */
436436
struct phy_package_shared *shared[PHY_MAX_ADDR];
437-
438-
/** @__unregister_callback: called at the last step of unregistration */
439-
void (*__unregister_callback)(struct mii_bus *bus);
440437
};
441438
#define to_mii_bus(d) container_of(d, struct mii_bus, dev)
442439

0 commit comments

Comments
 (0)