summaryrefslogtreecommitdiff
path: root/drivers/staging/ks7010/ks_wlan_net.c
diff options
context:
space:
mode:
authorTobin C. Harding <me@tobin.cc>2017-03-14 09:54:06 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-14 08:08:15 +0800
commit44dc9c86f9ed0e49b864e8337f98bbb1c09e0570 (patch)
treeb76b12e5536874902bc657d0c03387565fc3d41b /drivers/staging/ks7010/ks_wlan_net.c
parent7676b72428e84f344bd64fecc1d4c840e57a68d8 (diff)
staging: ks7010: remove unnecessary else statement
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 <me@tobin.cc> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010/ks_wlan_net.c')
-rw-r--r--drivers/staging/ks7010/ks_wlan_net.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 78204401220d..d55b5e30c038 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -1885,8 +1885,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;
@@ -2076,20 +2075,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));