staging: brcm80211: combined if statements
authorAlwin Beukers <alwin@broadcom.com>
Tue, 4 Oct 2011 21:19:09 +0000 (23:19 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 5 Oct 2011 20:39:04 +0000 (13:39 -0700)
Combined if statements in brcms_c_edcf_setparams and brcms_c_wme_setparams functions.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/main.c

index 4e2226e937ad94be08a4640c189fa0a406cd4732..30c5573e8866550bf95d1b4e9ff1377a5f7a49c1 100644 (file)
@@ -4186,12 +4186,10 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
                                          *shm_entry++);
        }
 
-       if (suspend)
+       if (suspend) {
                brcms_c_suspend_mac_and_wait(wlc);
-
-       if (suspend)
                brcms_c_enable_mac(wlc);
-
+       }
 }
 
 void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)
@@ -4223,12 +4221,10 @@ void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend)
                brcms_c_wme_setparams(wlc, aci, &txq_pars, suspend);
        }
 
-       if (suspend)
+       if (suspend) {
                brcms_c_suspend_mac_and_wait(wlc);
-
-       if (suspend)
                brcms_c_enable_mac(wlc);
-
+       }
 }
 
 /* maintain LED behavior in down state */