From aac22d07bc08befb0e3c7cbc2e91a8d8dce75cf2 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 19 May 2014 06:31:09 +0200 Subject: [PATCH] staging: wlags49_h2: make return of 0 explicit Delete unnecessary local variable whose value is always 0 and that hides the fact that the result is always 0. A simplified version of the semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ local idexpression ret; expression e; position p; @@ -ret = 0; ... when != ret = e return - ret + 0 ; // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlags49_h2/wl_wext.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 49eeeaee664b..3aeff818afc2 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -159,15 +159,12 @@ static int hermes_set_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr, /* Set up the LTV to clear the appropriate key */ static int hermes_clear_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr) { - int ret; - switch (key_idx) { case 0: if (!is_broadcast_ether_addr(addr)) { ltv->len = 7; ltv->typ = CFG_REMOVE_TKIP_MAPPED_KEY; memcpy(<v->u.u8[0], addr, ETH_ALEN); - ret = 0; } break; case 1: @@ -178,13 +175,12 @@ static int hermes_clear_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr) ltv->typ = CFG_REMOVE_TKIP_DEFAULT_KEY; ltv->u.u16[0] = cpu_to_le16(key_idx); - ret = 0; break; default: break; } - return ret; + return 0; } /* Set the WEP keys in the wl_private structure */ @@ -3027,13 +3023,10 @@ static int wireless_set_genie(struct net_device *dev, struct iw_point *data, char *extra) { - int ret = 0; - /* We can't write this to the card, but apparently this * operation needs to succeed */ - ret = 0; - return ret; + return 0; } /*============================================================================*/ -- 2.30.2