staging: brcm80211: fixed checkpatch warnings

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/aiutils.c b/drivers/staging/brcm80211/brcmsmac/aiutils.c
index 0b3ba6a7474805980fce86850fdf2ec116fa0470..8d4024e50801865b3283fbc067d0448338575eb7 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/staging/brcm80211/brcmsmac/aiutils.c
@@ -1054,9 +1054,8 @@ static struct si_info *ai_doattach(struct si_info *sii,
        cc = (struct chipcregs __iomem *) regs;
 
        /* bus/core/clk setup for register access */
-       if (!ai_buscore_prep(sii)) {
+       if (!ai_buscore_prep(sii))
                return NULL;
-       }
 
        /*
         * ChipID recognition.
@@ -1084,19 +1083,18 @@ static struct si_info *ai_doattach(struct si_info *sii,
                return NULL;
        }
        /* no cores found, bail out */
-       if (sii->numcores == 0) {
+       if (sii->numcores == 0)
                return NULL;
-       }
+
        /* bus/core/clk setup */
        origidx = SI_CC_IDX;
-       if (!ai_buscore_setup(sii, savewin, &origidx)) {
+       if (!ai_buscore_setup(sii, savewin, &origidx))
                goto exit;
-       }
 
        /* Init nvram from sprom/otp if they exist */
-       if (srom_var_init(&sii->pub, cc, vars, varsz)) {
+       if (srom_var_init(&sii->pub, cc, vars, varsz))
                goto exit;
-       }
+
        pvars = vars ? *vars : NULL;
        ai_nvram_process(sii, pvars);
 

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 39b91d6b763196e37e4d51cb99670c2ea879ca68..db05521a7ad888b7b158f20061d68effc3b3132e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -5995,9 +5995,8 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
         * If we are switching to gmode == GMODE_LEGACY_B,
         * clean up rate info that may refer to OFDM rates.
         */
-       if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B)) {
+       if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B))
                band->gmode = gmode;
-       }
 
        band->gmode = gmode;
 

diff --git a/drivers/staging/brcm80211/brcmsmac/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c
index e3cce2962200c936365feb7130967bd16b63f061..460b105469595fcc01c80ede519ffa9ffa1551df 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/nicpci.c
+++ b/drivers/staging/brcm80211/brcmsmac/nicpci.c
@@ -394,9 +394,8 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)
                i++;
        }
 
-       if (i >= pcie_serdes_spinwait) {
+       if (i >= pcie_serdes_spinwait)
                return false;
-       }
 
        return true;
 }

diff --git a/drivers/staging/brcm80211/brcmsmac/srom.c b/drivers/staging/brcm80211/brcmsmac/srom.c
index 6f3b12c0e0fb603644a1a9be0f463dfda72c354d..13d17ebe6df8bf30758da2933c29142871547772 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/srom.c
+++ b/drivers/staging/brcm80211/brcmsmac/srom.c
@@ -1175,8 +1175,7 @@ static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap,
                        if (sromrev == 0x10)
                                sromrev = 1;
                }
-       }
-       else {
+       } else {
                /* Use OTP if SPROM not available */
                err = otp_read_pci(sih, srom, SROM_MAX);
                if (err == 0)