2010-10-29 22:13:55

by Nicolas Kaiser

[permalink] [raw]
Subject: [PATCH] staging/brcm80211: simplify expression

Simplify: ((a && b) || !a) => (b || !a)

Signed-off-by: Nicolas Kaiser <[email protected]>
---
drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index feaffcc..aab2d8b 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -667,7 +667,7 @@ bool wlc_ps_check(wlc_info_t *wlc)
* may be either true or false due to the low level override.
*/
wake = STAY_AWAKE(wlc);
- wake_ok = (wake && ((tmp & MCTL_WAKE) != 0)) || !wake;
+ wake_ok = ((tmp & MCTL_WAKE) != 0) || !wake;
#endif
if (hps && !wake_ok) {
WL_ERROR(("wl%d: wake not sync, sw %d maccontrol 0x%x\n", wlc->pub->unit, wake, tmp));
--
1.7.2.2