From 0f90d23cf4124616f9a42036b50ba5cc3724868c Mon Sep 17 00:00:00 2001 From: Alwin Beukers Date: Tue, 4 Oct 2011 23:19:09 +0200 Subject: [PATCH] staging: brcm80211: combined if statements Combined if statements in brcms_c_edcf_setparams and brcms_c_wme_setparams functions. Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmsmac/main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index 4e2226e937ad..30c5573e8866 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 */ -- 2.20.1