From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: "Tobin C. Harding" Subject: [PATCH 08/12] staging: ks7010: remove unnecessary else statement Date: Tue, 14 Mar 2017 09:54:06 +1100 Message-Id: <1489445650-11398-9-git-send-email-me@tobin.cc> In-Reply-To: <1489445650-11398-1-git-send-email-me@tobin.cc> References: <1489445650-11398-1-git-send-email-me@tobin.cc> List-ID: To: Greg Kroah-Hartman Cc: "Tobin C. Harding" , Wolfram Sang , driverdev-devel@linuxdriverproject.org Checkpatch emits WARNING: else is not generally useful after a break or return. Two warnings of this type are emitted, both are the result of a else statement after a return statement. The 'else' can safely be removed. Remove unnecessary else statement. Signed-off-by: Tobin C. Harding --- drivers/staging/ks7010/ks_wlan_net.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index cee3971..1451ba7 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -1999,8 +1999,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev, /* for SLEEP MODE */ if (index < 1 || index > 4) return -EINVAL; - else - index--; + index--; if (dwrq->flags & IW_ENCODE_DISABLED) priv->wpa.key[index].key_len = 0; @@ -2196,20 +2195,21 @@ static int ks_wlan_set_pmksa(struct net_device *dev, case IW_PMKSA_REMOVE: if (list_empty(&priv->pmklist.head)) { /* list empty */ return -EINVAL; - } else { /* search cache data */ - list_for_each(ptr, &priv->pmklist.head) { - pmk = list_entry(ptr, struct pmk_t, list); - if (!memcmp(pmksa->bssid.sa_data, pmk->bssid, ETH_ALEN)) { /* match address! list del. */ - eth_zero_addr(pmk->bssid); - memset(pmk->pmkid, 0, IW_PMKID_LEN); - list_del_init(&pmk->list); - break; - } - } - if (ptr == &priv->pmklist.head) { /* not find address. */ - return 0; + } + /* search cache data */ + list_for_each(ptr, &priv->pmklist.head) { + pmk = list_entry(ptr, struct pmk_t, list); + if (!memcmp(pmksa->bssid.sa_data, pmk->bssid, ETH_ALEN)) { /* match address! list del. */ + eth_zero_addr(pmk->bssid); + memset(pmk->pmkid, 0, IW_PMKID_LEN); + list_del_init(&pmk->list); + break; } } + if (ptr == &priv->pmklist.head) { /* not find address. */ + return 0; + } + break; case IW_PMKSA_FLUSH: memset(&priv->pmklist, 0, sizeof(priv->pmklist)); -- 2.7.4