[PATCH net-next v1 2/7] net: usb: lan78xx: Move fixed PHY cleanup to lan78xx_unbind()

Oleksij Rempel
2025-01-08T12:13:51Z

Move the cleanup of the fixed PHY to the lan78xx_unbind() function,
which is invoked during both the probe and disconnect paths. This
change eliminates duplicate cleanup code in the disconnect routine and
ensures that the fixed PHY is properly freed during other probe steps.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/usb/lan78xx.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 6dfd9301279f..3d0097d07bcd 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -474,6 +474,8 @@ struct lan78xx_net {

struct phylink *phylink;
struct phylink_config phylink_config;
+
+ struct phy_device *fixed_phy;
};

/* use ethtool to change the level for any given device */
@@ -2589,6 +2591,8 @@ static struct phy_device *lan7801_phy_init(struct lan78xx_net *dev)
netdev_err(dev->net, "No PHY/fixed_PHY found\n");
return NULL;
}
+
+ dev->fixed_phy = phydev;
netdev_dbg(dev->net, "Registered FIXED PHY\n");
phydev->interface = PHY_INTERFACE_MODE_RGMII;
ret = lan78xx_write_reg(dev, MAC_RGMII_ID,
@@ -2690,14 +2694,8 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)

ret = phylink_connect_phy(dev->phylink, phydev);
if (ret) {
- netdev_err(dev->net, "can't attach PHY to %s\n",
- dev->mdiobus->id);
- if (dev->chipid == ID_REV_CHIP_ID_7801_) {
- if (phy_is_pseudo_fixed_link(phydev)) {
- fixed_phy_unregister(phydev);
- phy_device_free(phydev);
- }
- }
+ netdev_err(dev->net, "can't attach PHY to %s, error %pe\n",
+ dev->mdiobus->id, ERR_PTR(ret));
return -EIO;
}

@@ -3652,6 +3650,12 @@ static void lan78xx_unbind(struct lan78xx_net *dev, struct usb_interface *intf)
{
struct lan78xx_priv *pdata = (struct lan78xx_priv *)(dev->data[0]);

+ if (dev->fixed_phy) {
+ fixed_phy_unregister(dev->fixed_phy);
+ phy_device_free(dev->fixed_phy);
+ dev->fixed_phy = NULL;
+ }
+
lan78xx_remove_irq_domain(dev);

lan78xx_remove_mdio(dev);
@@ -4378,7 +4382,6 @@ static void lan78xx_disconnect(struct usb_interface *intf)
struct lan78xx_net *dev;
struct usb_device *udev;
struct net_device *net;
- struct phy_device *phydev;

dev = usb_get_intfdata(intf);
usb_set_intfdata(intf, NULL);
@@ -4401,11 +4404,6 @@ static void lan78xx_disconnect(struct usb_interface *intf)
set_bit(EVENT_DEV_DISCONNECT, &dev->flags);
cancel_delayed_work_sync(&dev->wq);

- if (phy_is_pseudo_fixed_link(phydev)) {
- fixed_phy_unregister(phydev);
- phy_device_free(phydev);
- }
-
phylink_destroy(dev->phylink);

usb_scuttle_anchored_urbs(&dev->deferred);
--
2.39.5