diff options
| author | Rajbinder Brar <brar.rajbinder@gmail.com> | 2014-09-23 04:46:17 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-23 20:42:54 (GMT) |
| commit | 3b9999ec18c569d485bdaee86224214eeef1d2b0 (patch) | |
| tree | 248e4ee5c585faf877d83b79a04e0cb02033d7f9 /drivers/staging/vt6656 | |
| parent | 3e46587ef1582ad4da40bf631dba0c6c8c8a7a47 (diff) | |
| download | linux-3b9999ec18c569d485bdaee86224214eeef1d2b0.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/rf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index c0edcae..c42cde5 100644 --- a/drivers/staging/vt6656/rf.c +++ b/drivers/staging/vt6656/rf.c @@ -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) |