[PATCH] wireless: marvell/libertas: Remove unnecessary label of lbs_ethtool_get_eeprom

Subsystems: marvell libertas wireless driver, the rest

STALE1836d LANDED

Landed in mainline as 18cb62367a8f on 2021-08-01.

2 messages, 2 authors, 2021-08-01 · open the first message on its own page

[PATCH] wireless: marvell/libertas: Remove unnecessary label of lbs_ethtool_get_eeprom

From: <hidden>
Date: 2021-06-25 12:58:53

From: dingsenjie <redacted>

The label is only used once, so we delete it and use the
return statement instead of the goto statement.

Signed-off-by: dingsenjie <redacted>
---
 drivers/net/wireless/marvell/libertas/ethtool.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/marvell/libertas/ethtool.c b/drivers/net/wireless/marvell/libertas/ethtool.c
index 1bb8746..d8e4f29 100644
--- a/drivers/net/wireless/marvell/libertas/ethtool.c
+++ b/drivers/net/wireless/marvell/libertas/ethtool.c
@@ -43,10 +43,8 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev,
 	int ret;
 
 	if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN ||
-	    eeprom->len > LBS_EEPROM_READ_LEN) {
-		ret = -EINVAL;
-		goto out;
-	}
+	    eeprom->len > LBS_EEPROM_READ_LEN)
+		return -EINVAL;
 
 	cmd.hdr.size = cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) -
 		LBS_EEPROM_READ_LEN + eeprom->len);
@@ -57,8 +55,7 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev,
 	if (!ret)
 		memcpy(bytes, cmd.value, eeprom->len);
 
-out:
-        return ret;
+	return ret;
 }
 
 static void lbs_ethtool_get_wol(struct net_device *dev,
-- 
1.9.1

Re: libertas: Remove unnecessary label of lbs_ethtool_get_eeprom

From: Kalle Valo <hidden>
Date: 2021-08-01 10:29:46

dingsenjie@163.com wrote:
From: dingsenjie <redacted>

The label is only used once, so we delete it and use the
return statement instead of the goto statement.

Signed-off-by: dingsenjie <redacted>
Patch applied to wireless-drivers-next.git, thanks.

18cb62367a8f libertas: Remove unnecessary label of lbs_ethtool_get_eeprom

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210625121108.162868-1-dingsenjie@163.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help