staging: wlan-ng: improved readability of function prism2_add_key

Improve readability of prism2_add_key:
a) Reduce nesting and removed goto statement by using more return statements.

Signed-off-by: Chris Opperman <eklikeroomys@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 07c52e396387a9e529e059d996956d4a87c35ce1..d4cf09b11e3324503e1323bf6eb07191b78926f1 100644 (file)
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -148,40 +148,26 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev,
        struct wlandevice *wlandev = dev->ml_priv;
        u32 did;
 
-       int err = 0;
-       int result = 0;
-
        if (key_index >= NUM_WEPKEYS)
                return -EINVAL;
 
-       switch (params->cipher) {
-       case WLAN_CIPHER_SUITE_WEP40:
-       case WLAN_CIPHER_SUITE_WEP104:
-               result = prism2_domibset_uint32(wlandev,
-                                               DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
-                                               key_index);
-               if (result)
-                       goto exit;
-
-               /* send key to driver */
-               did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1);
-
-               result = prism2_domibset_pstr32(wlandev, did,
-                                               params->key_len, params->key);
-               if (result)
-                       goto exit;
-               break;
-
-       default:
+       if (params->cipher != WLAN_CIPHER_SUITE_WEP40 &&
+           params->cipher != WLAN_CIPHER_SUITE_WEP104) {
                pr_debug("Unsupported cipher suite\n");
-               result = 1;
+               return -EFAULT;
        }
 
-exit:
-       if (result)
-               err = -EFAULT;
+       if (prism2_domibset_uint32(wlandev,
+                                  DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+                                  key_index))
+               return -EFAULT;
 
-       return err;
+       /* send key to driver */
+       did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1);
+
+       if (prism2_domibset_pstr32(wlandev, did, params->key_len, params->key))
+               return -EFAULT;
+       return 0;
 }
 
 static int prism2_get_key(struct wiphy *wiphy, struct net_device *dev,