Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[cascardo/linux.git] / drivers / staging / wlan-ng / prism2mib.c

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index f471708..b4a15ef 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -582,8 +582,6 @@ static int prism2mib_privacyinvoked(struct mibrec *mib,
                                    struct p80211msg_dot11req_mibset *msg,
                                    void *data)
 {
-       int result;
-
        if (wlandev->hostwep & HOSTWEP_DECRYPT) {
                if (wlandev->hostwep & HOSTWEP_DECRYPT)
                        mib->parm2 |= HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
@@ -591,9 +589,7 @@ static int prism2mib_privacyinvoked(struct mibrec *mib,
                        mib->parm2 |= HFA384x_WEPFLAGS_DISABLE_TXCRYPT;
        }
 
-       result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
-
-       return result;
+       return prism2mib_flag(mib, isget, wlandev, hw, msg, data);
 }
 
 /*----------------------------------------------------------------
@@ -628,11 +624,8 @@ static int prism2mib_excludeunencrypted(struct mibrec *mib,
                                        struct p80211msg_dot11req_mibset *msg,
                                        void *data)
 {
-       int result;
-
-       result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
 
-       return result;
+       return prism2mib_flag(mib, isget, wlandev, hw, msg, data);
 }
 
 /*----------------------------------------------------------------
@@ -717,8 +710,6 @@ static int prism2mib_priv(struct mibrec *mib,
 {
        p80211pstrd_t *pstr = (p80211pstrd_t *) data;
 
-       int result;
-
        switch (mib->did) {
        case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
                        hfa384x_WPAData_t wpa;
@@ -734,11 +725,10 @@ static int prism2mib_priv(struct mibrec *mib,
                                wpa.datalen = cpu_to_le16(pstr->len);
                                memcpy(wpa.data, pstr->data, pstr->len);
 
-                               result =
-                                   hfa384x_drvr_setconfig(hw,
-                                                  HFA384x_RID_CNFWPADATA,
-                                                  (u8 *) &wpa,
-                                                  sizeof(wpa));
+                               hfa384x_drvr_setconfig(hw,
+                                                      HFA384x_RID_CNFWPADATA,
+                                                      (u8 *) &wpa,
+                                                      sizeof(wpa));
                        }
                        break;
                }