Thread (2 messages) 2 messages, 2 authors, 2021-07-21
STALE1772d

[PATCH] rtl8xxxu: remove unnecessary labels

From: samirweng1979 <hidden>
Date: 2021-07-20 07:01:59
Also in: linux-wireless, lkml
Subsystem: rtl8xxxu wireless driver (rtl8xxxu), the rest · Maintainers: Jes Sorensen, Linus Torvalds

From: wengjianfeng <redacted>

Simplify the code by removing unnecessary labels and returning directly.

Signed-off-by: wengjianfeng <redacted>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
index 4f93f88..3fd14e6 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
@@ -256,10 +256,8 @@ static int rtl8723a_emu_to_active(struct rtl8xxxu_priv *priv)
 		udelay(10);
 	}
 
-	if (!count) {
-		ret = -EBUSY;
-		goto exit;
-	}
+	if (!count)
+		return -EBUSY;
 
 	/* We should be able to optimize the following three entries into one */
 
@@ -292,10 +290,8 @@ static int rtl8723a_emu_to_active(struct rtl8xxxu_priv *priv)
 		udelay(10);
 	}
 
-	if (!count) {
-		ret = -EBUSY;
-		goto exit;
-	}
+	if (!count)
+		return -EBUSY;
 
 	/* 0x4C[23] = 0x4E[7] = 1, switch DPDT_SEL_P output from WL BB */
 	/*
@@ -307,7 +303,6 @@ static int rtl8723a_emu_to_active(struct rtl8xxxu_priv *priv)
 	val8 &= ~LEDCFG2_DPDT_SELECT;
 	rtl8xxxu_write8(priv, REG_LEDCFG2, val8);
 
-exit:
 	return ret;
 }
 
@@ -327,7 +322,7 @@ static int rtl8723au_power_on(struct rtl8xxxu_priv *priv)
 
 	ret = rtl8723a_emu_to_active(priv);
 	if (ret)
-		goto exit;
+		return ret;
 
 	/*
 	 * 0x0004[19] = 1, reset 8051
@@ -353,7 +348,7 @@ static int rtl8723au_power_on(struct rtl8xxxu_priv *priv)
 	val32 &= ~(BIT(28) | BIT(29) | BIT(30));
 	val32 |= (0x06 << 28);
 	rtl8xxxu_write32(priv, REG_EFUSE_CTRL, val32);
-exit:
+
 	return ret;
 }
 
-- 
1.9.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help