diff mbox series

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

Message ID 20241216120941.1690908-4-o.rempel@pengutronix.de (mailing list archive)
State Accepted
Commit 7433d022b915977a0e361a036aa06a0d382a9630
Delegated to: Netdev Maintainers
Headers show
Series lan78xx: Preparations for PHYlink | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1 this patch: 1
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers warning 1 maintainers not CCed: linux-usb@vger.kernel.org
netdev/build_clang success Errors and warnings before: 6 this patch: 6
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 3 this patch: 3
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 38 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-12-18--03-01 (tests: 878)

Commit Message

Oleksij Rempel Dec. 16, 2024, 12:09 p.m. UTC 
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(-)

Comments

Mateusz Polchlopek Dec. 16, 2024, 1:13 p.m. UTC | #1 
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>
diff mbox series

Patch

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;