diff options
| author | Alwin Beukers <alwin@broadcom.com> | 2011-10-04 23:18:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-05 13:39:02 -0700 |
| commit | 406f8d656c6331e27f31713473c840c0d26d5c60 (patch) | |
| tree | 192ac33bc11917e417450681900567fdd46d9a97 /drivers | |
| parent | ef8299ddee722c32e6e7f30dc34bb108f7fc017b (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/aiutils.c | 14 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/main.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/nicpci.c | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/srom.c | 3 |
4 files changed, 9 insertions, 14 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/aiutils.c b/drivers/staging/brcm80211/brcmsmac/aiutils.c index 0b3ba6a74748..8d4024e50801 100644 --- 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 39b91d6b7631..db05521a7ad8 100644 --- 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 e3cce2962200..460b10546959 100644 --- 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 6f3b12c0e0fb..13d17ebe6df8 100644 --- 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) |