3 files changed, 10 insertions, 12 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 0b467b08604d..2bf5dda29291 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -767,7 +767,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
                 brcmf_dbg(INFO, "CLKCTL: turned ON\n");
 
 #if defined(DEBUG)
-                if (bus->alp_only != true) {
+                if (!bus->alp_only) {
                         if (SBSDIO_ALPONLY(clkctl))
                                 brcmf_dbg(ERROR, "HT Clock should be on\n");
                 }
@@ -2059,8 +2059,7 @@ static void
 brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar)
 {
         up(&bus->sdsem);
-        wait_event_interruptible_timeout(bus->ctrl_wait,
-                                         (*lockvar == false), HZ * 2);
+        wait_event_interruptible_timeout(bus->ctrl_wait, !*lockvar, HZ * 2);
         down(&bus->sdsem);
         return;
 }
@@ -2647,8 +2646,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
 
         /* Priority based enq */
         spin_lock_bh(&bus->txqlock);
-        if (brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec) ==
-            false) {
+        if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) {
                 skb_pull(pkt, SDPCM_HDRLEN);
                 brcmf_txcomplete(bus->sdiodev->dev, pkt, false);
                 brcmu_pkt_buf_free_skb(pkt);
@@ -2935,7 +2933,7 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
 
                 brcmf_sdbrcm_wait_for_event(bus, &bus->ctrl_frame_stat);
 
-                if (bus->ctrl_frame_stat == false) {
+                if (!bus->ctrl_frame_stat) {
                         brcmf_dbg(INFO, "ctrl_frame_stat == false\n");
                         ret = 0;
                 } else {
@@ -2997,7 +2995,7 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
                           rxlen, msglen);
         } else if (timeleft == 0) {
                 brcmf_dbg(ERROR, "resumed on timeout\n");
-        } else if (pending == true) {
+        } else if (pending) {
                 brcmf_dbg(CTL, "cancelled\n");
                 return -ERESTARTSYS;
         } else {
@@ -3979,7 +3977,7 @@ void
 brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)
 {
         /* Totally stop the timer */
-        if (!wdtick && bus->wd_timer_valid == true) {
+        if (!wdtick && bus->wd_timer_valid) {
                 del_timer_sync(&bus->timer);
                 bus->wd_timer_valid = false;
                 bus->save_ms = wdtick;
@@ -3992,7 +3990,7 @@ brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)
 
         if (wdtick) {
                 if (bus->save_ms != BRCMF_WD_POLL_MS) {
-                        if (bus->wd_timer_valid == true)
+                        if (bus->wd_timer_valid)
                                 /* Stop timer and restart at new value */
                                 del_timer_sync(&bus->timer);
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 86186fa82946..231ddf4a674f 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -3247,7 +3247,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
         }
 
         /* For old ucode, txfifo sizes needs to be modified(increased) */
-        if (fifosz_fixup == true)
+        if (fifosz_fixup)
                 brcms_b_corerev_fifofixup(wlc_hw);
 
         /* check txfifo allocations match between ucode and driver */
@@ -5426,7 +5426,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
                 return -EINVAL;
 
         /* update configuration value */
-        if (config == true)
+        if (config)
                 brcms_c_protection_upd(wlc, BRCMS_PROT_G_USER, gmode);
 
         /* Clear rateset override */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 9595ecd38c1f..39095741fd05 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -21444,7 +21444,7 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init)
         if (NREV_GE(pi->pubpi.phy_rev, 3)) {
                 u16 v0 = 0x211, v1 = 0x222, v2 = 0x144, v3 = 0x188;
 
-                if (lut_init == false)
+                if (!lut_init)
                         return;
 
                 if (pi->srom_fem2g.antswctrllut == 0) {