From: Oscar Carter <oscar.carter@gmx.com>
Date: Sat, 25 Apr 2020 15:17:46 +0000 (+0200)
Subject: staging: vt6656: Use return instead of goto
X-Git-Tag: v5.15~3664^2~187
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d78b62c3eaf257dfb114f579c797a4777e3f45d4;p=platform%2Fkernel%2Flinux-starfive.git

staging: vt6656: Use return instead of goto

Replace the "goto" statements with a direct "return ret" as the jump
label only returns the ret variable.

Also, remove the unnecessary variable initialization because the ret
variable is set a few lines later.

Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
Link: https://lore.kernel.org/r/20200425151747.8199-3-oscar.carter@gmx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 12a3f47..2788453 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -759,7 +759,7 @@ void vnt_rf_rssi_to_dbm(struct vnt_private *priv, u8 rssi, long *dbm)
 
 int vnt_rf_table_download(struct vnt_private *priv)
 {
-	int ret = 0;
+	int ret;
 	u16 length1 = 0, length2 = 0, length3 = 0;
 	u8 *addr1 = NULL, *addr2 = NULL, *addr3 = NULL;
 	u16 length, value;
@@ -812,7 +812,7 @@ int vnt_rf_table_download(struct vnt_private *priv)
 	ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,
 			      MESSAGE_REQUEST_RF_INIT, length1, addr1);
 	if (ret)
-		goto end;
+		return ret;
 
 	/* Channel Table 0 */
 	value = 0;
@@ -825,7 +825,7 @@ int vnt_rf_table_download(struct vnt_private *priv)
 		ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, value,
 				      MESSAGE_REQUEST_RF_CH0, length, addr2);
 		if (ret)
-			goto end;
+			return ret;
 
 		length2 -= length;
 		value += length;
@@ -843,7 +843,7 @@ int vnt_rf_table_download(struct vnt_private *priv)
 		ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, value,
 				      MESSAGE_REQUEST_RF_CH1, length, addr3);
 		if (ret)
-			goto end;
+			return ret;
 
 		length3 -= length;
 		value += length;
@@ -860,7 +860,7 @@ int vnt_rf_table_download(struct vnt_private *priv)
 		ret = vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,
 				      MESSAGE_REQUEST_RF_INIT2, length1, addr1);
 		if (ret)
-			goto end;
+			return ret;
 
 		/* Channel Table 0 */
 		value = 0;
@@ -874,7 +874,7 @@ int vnt_rf_table_download(struct vnt_private *priv)
 					      MESSAGE_REQUEST_RF_CH2, length,
 					      addr2);
 			if (ret)
-				goto end;
+				return ret;
 
 			length2 -= length;
 			value += length;
@@ -882,6 +882,5 @@ int vnt_rf_table_download(struct vnt_private *priv)
 		}
 	}
 
-end:
-	return ret;
+	return 0;
 }