[PATCH net-next v1 3/6] net: usb: lan78xx: Use action-specific label in lan78xx_mac_reset

Oleksij Rempel posted 6 patches 1 year ago
There is a newer version of this series
[PATCH net-next v1 3/6] net: usb: lan78xx: Use action-specific label in lan78xx_mac_reset
Posted by Oleksij Rempel 1 year ago
Rename the generic `done` label to the action-specific `exit_unlock`
label in `lan78xx_mac_reset`. This improves clarity by indicating the
specific cleanup action (mutex unlock) and aligns with best practices
for error handling and cleanup labels.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
 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 4674051f5c9c..30301af29ab2 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_mdiobus_wait_not_busy(dev);
 	if (ret < 0)
-		goto done;
+		goto exit_unlock;
 
 	ret = lan78xx_read_reg(dev, MAC_CR, &val);
 	if (ret < 0)
-		goto done;
+		goto exit_unlock;
 
 	val |= MAC_CR_RST_;
 	ret = lan78xx_write_reg(dev, MAC_CR, val);
 	if (ret < 0)
-		goto done;
+		goto exit_unlock;
 
 	/* 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 exit_unlock;
 
 		if (!(val & MAC_CR_RST_)) {
 			ret = 0;
-			goto done;
+			goto exit_unlock;
 		}
 	} while (!time_after(jiffies, start_time + HZ));
 
 	ret = -ETIMEDOUT;
-done:
+exit_unlock:
 	mutex_unlock(&dev->phy_mutex);
 
 	return ret;
-- 
2.39.5
Re: [PATCH net-next v1 3/6] net: usb: lan78xx: Use action-specific label in lan78xx_mac_reset
Posted by Mateusz Polchlopek 1 year ago

On 12/16/2024 1:09 PM, Oleksij Rempel wrote:

[...]

>   	if (ret < 0)
> -		goto done;
> +		goto exit_unlock;
>   
>   	ret = lan78xx_read_reg(dev, MAC_CR, &val);
>   	if (ret < 0)
> -		goto done;
> +		goto exit_unlock;
>   
>   	val |= MAC_CR_RST_;
>   	ret = lan78xx_write_reg(dev, MAC_CR, val);
>   	if (ret < 0)
> -		goto done;
> +		goto exit_unlock;
>   
>   	/* 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 exit_unlock;
>   
>   		if (!(val & MAC_CR_RST_)) {
>   			ret = 0;
> -			goto done;
> +			goto exit_unlock;
>   		}
>   	} while (!time_after(jiffies, start_time + HZ));
>   
>   	ret = -ETIMEDOUT;
> -done:
> +exit_unlock:
>   	mutex_unlock(&dev->phy_mutex);
>   
>   	return ret;

Nice cleanup, now the label indicates what it does.

Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>