[PATCH net-next v1 08/11] net: usb: lan78xx: Use function-specific label in lan78xx_mac_reset
flat view
STALE677d
SUPERSEDED
From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: 2024-12-09 13:08:02
Also in:
lkml
Subsystem:
networking drivers, the rest, usb lan78xx ethernet driver, usb networking drivers · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Thangaraj Samynathan
Revision v1 of 3 in this series.
Revisions (3)
- v1
- v2 [diff vs current]
- v1 current
Rename the generic `done` label to the function-specific `mac_reset_done` label in `lan78xx_mac_reset`. This improves clarity and aligns with best practices for error handling and cleanup labels. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/usb/lan78xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index c66e404f51ac..fdeb95db529b 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c@@ -1604,16 +1604,16 @@ static int lan78xx_mac_reset(struct lan78xx_net *dev) */ ret = lan78xx_phy_wait_not_busy(dev); if (ret < 0) - goto done; + goto mac_reset_done; ret = lan78xx_read_reg(dev, MAC_CR, &val); if (ret < 0) - goto done; + goto mac_reset_done; val |= MAC_CR_RST_; ret = lan78xx_write_reg(dev, MAC_CR, val); if (ret < 0) - goto done; + goto mac_reset_done; /* Wait for the reset to complete before allowing any further * MAC register accesses otherwise the MAC may lock up.
@@ -1621,16 +1621,16 @@ static int lan78xx_mac_reset(struct lan78xx_net *dev) do { ret = lan78xx_read_reg(dev, MAC_CR, &val); if (ret < 0) - goto done; + goto mac_reset_done; if (!(val & MAC_CR_RST_)) { ret = 0; - goto done; + goto mac_reset_done; } } while (!time_after(jiffies, start_time + HZ)); ret = -ETIMEDOUT; -done: +mac_reset_done: mutex_unlock(&dev->phy_mutex); return ret;
--
2.39.5