Commit 3b9999ec authored Sep 23, 2014 by Rajbinder Brar Committed by Greg Kroah-Hartman Sep 23, 2014

Staging: vt6656: Merge two lines of code into one



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: Rajbinder Brar <brar.rajbinder@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3e46587e

drivers/staging/vt6656/rf.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -623,7 +623,6 @@ int vnt_rf_write_embedded(struct vnt_private *priv, u32 data)
		/* Set Tx power by rate and channel number */
		int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel)
		{
		int ret = true;
		u8 power = priv->cck_pwr;

		if (channel == 0)
		@@ -653,9 +652,7 @@ int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel)
		break;
		}

		ret = vnt_rf_set_txpower(priv, power, rate);

		return ret;
		return vnt_rf_set_txpower(priv, power, rate);
		}

		static u8 vnt_rf_addpower(struct vnt_private *priv)

Admin message