From: Alwin Beukers <alwin@xxxxxxxxxxxx> Combined if statements in brcms_c_edcf_setparams and brcms_c_wme_setparams functions. Reviewed-by: Pieter-Paul Giesberts <pieterpg@xxxxxxxxxxxx> Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx> Reviewed-by: Arend van Spriel <arend@xxxxxxxxxxxx> Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx> --- drivers/staging/brcm80211/brcmsmac/main.c | 12 ++++-------- 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 */ -- 1.7.4.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel