Commit eab4e78d authored Sep 21, 2014 by Mahati Chamarthy Committed by Greg Kroah-Hartman Sep 23, 2014

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



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
     f(...);
-return ret;

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

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 88c9cc00

drivers/staging/vt6656/rxtx.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message