Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+1
-17
+1
-11
drivers/net/mdio/of_mdio.c
+1
-11
drivers/net/mdio/of_mdio.c
···
139
139
}
140
140
EXPORT_SYMBOL(of_mdiobus_child_is_phy);
141
141
142
-
static void __of_mdiobus_unregister_callback(struct mii_bus *mdio)
143
-
{
144
-
of_node_put(mdio->dev.of_node);
145
-
}
146
-
147
142
/**
148
143
* __of_mdiobus_register - Register mii_bus and create PHYs from the device tree
149
144
* @mdio: pointer to mii_bus structure
···
166
171
* the device tree are populated after the bus has been registered */
167
172
mdio->phy_mask = ~0;
168
173
169
-
mdio->__unregister_callback = __of_mdiobus_unregister_callback;
170
-
of_node_get(np);
171
174
device_set_node(&mdio->dev, of_fwnode_handle(np));
172
175
173
176
/* Get bus level PHY reset GPIO details */
···
177
184
/* Register the MDIO bus */
178
185
rc = __mdiobus_register(mdio, owner);
179
186
if (rc)
180
-
goto put_node;
187
+
return rc;
181
188
182
189
/* Loop over the child nodes and register a phy_device for each phy */
183
190
for_each_available_child_of_node(np, child) {
···
237
244
unregister:
238
245
of_node_put(child);
239
246
mdiobus_unregister(mdio);
240
-
241
-
put_node:
242
-
of_node_put(np);
243
247
return rc;
244
248
}
245
249
EXPORT_SYMBOL(__of_mdiobus_register);
-3
drivers/net/phy/mdio_bus.c
-3
drivers/net/phy/mdio_bus.c
-3
include/linux/phy.h
-3
include/linux/phy.h
···
434
434
435
435
/** @shared: shared state across different PHYs */
436
436
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);
440
437
};
441
438
#define to_mii_bus(d) container_of(d, struct mii_bus, dev)
442
439