summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211
diff options
context:
space:
mode:
authorAlwin Beukers <alwin@broadcom.com>2011-10-04 23:19:09 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-05 13:39:04 -0700
commit0f90d23cf4124616f9a42036b50ba5cc3724868c (patch)
tree927d287eea662aaafa873a9ece92915ba80af7b0 /drivers/staging/brcm80211
parentfa1b6ab7a5cea3ae0c0eed0704c47e7bfd6ac20c (diff)
downloadop-kernel-dev-0f90d23cf4124616f9a42036b50ba5cc3724868c.zip
op-kernel-dev-0f90d23cf4124616f9a42036b50ba5cc3724868c.tar.gz
staging: brcm80211: combined if statements
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>
Diffstat (limited to 'drivers/staging/brcm80211')
-rw-r--r--drivers/staging/brcm80211/brcmsmac/main.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 4e2226e..30c5573 100644
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -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 */
OpenPOWER on IntegriCloud