summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMahati Chamarthy <mahati.chamarthy@gmail.com>2014-09-21 20:53:52 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-23 13:40:17 -0700
commit88c9cc0092788ad37bc6ea7fe669358d0fbcb095 (patch)
tree6d7fff3bf5c1f53f4252b799cd573f1d452c219e /drivers
parentfdeef1fe4d5361cfa819313a89a0c39e2d3ed066 (diff)
Staging: vt6656: Merges two lines of code and 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/vt6656/key.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index 22f2961d222..181745d8e25 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -37,17 +37,14 @@
int vnt_key_init_table(struct vnt_private *priv)
{
- int ret;
u8 i;
u8 data[MAX_KEY_TABLE];
for (i = 0; i < MAX_KEY_TABLE; i++)
data[i] = i;
- ret = vnt_control_out(priv, MESSAGE_TYPE_CLRKEYENTRY,
+ return vnt_control_out(priv, MESSAGE_TYPE_CLRKEYENTRY,
0, 0, ARRAY_SIZE(data), data);
-
- return ret;
}
static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,