Staging: vt6656: Merges two lines of code and also removes unused variable

Author: Mahati Chamarthy <>

This patch merges an assignment with an immediately following return of
the assigned variable.  The following Coccinelle semantic patch was used
to make this transformation:

expression ret;
identifier f;

-ret =
-return ret;

A variable that became unused due to this transformation was also removed.

Signed-off-by: Mahati Chamarthy 
Acked-by: Julia Lawall 
Signed-off-by: Greg Kroah-Hartman 
 drivers/staging/vt6656/rxtx.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 852ebe8..ea5140a 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -1083,8 +1083,6 @@ int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif)
 int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif,
 	struct ieee80211_bss_conf *conf)
-	int ret;
 	vnt_mac_reg_bits_off(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
 	vnt_mac_reg_bits_off(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);
@@ -1097,7 +1095,5 @@ int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif,
 	vnt_reset_next_tbtt(priv, conf->beacon_int);
-	ret = vnt_beacon_make(priv, vif);
-	return ret;
+	return vnt_beacon_make(priv, vif);