From 3b9999ec18c569d485bdaee86224214eeef1d2b0 Mon Sep 17 00:00:00 2001 From: Rajbinder Brar Date: Tue, 23 Sep 2014 10:16:17 +0530 Subject: [PATCH] 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 Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index c0edcae55e30..c42cde59f598 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) -- 2.20.1