From c73f3a6561cdc0fde6d90e6c032da7cfbd2cd163 Mon Sep 17 00:00:00 2001
From: Alwin Beukers <alwin@broadcom.com>
Date: Tue, 4 Oct 2011 23:18:56 +0200
Subject: [PATCH] --- yaml --- r: 268697 b: refs/heads/master c:
 406f8d656c6331e27f31713473c840c0d26d5c60 h: refs/heads/master i:   268695:
 f3a9079614487ecbd79fc165a40fa6c3a5e8e18b v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c | 14 ++++++--------
 trunk/drivers/staging/brcm80211/brcmsmac/main.c    |  3 +--
 trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c  |  3 +--
 trunk/drivers/staging/brcm80211/brcmsmac/srom.c    |  3 +--
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 976c389e3423..b90f568e1b62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef8299ddee722c32e6e7f30dc34bb108f7fc017b
+refs/heads/master: 406f8d656c6331e27f31713473c840c0d26d5c60
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c b/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
index 0b3ba6a74748..8d4024e50801 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/aiutils.c
+++ b/trunk/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/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index 39b91d6b7631..db05521a7ad8 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/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/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c b/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c
index e3cce2962200..460b10546959 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c
+++ b/trunk/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/trunk/drivers/staging/brcm80211/brcmsmac/srom.c b/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
index 6f3b12c0e0fb..13d17ebe6df8 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/srom.c
+++ b/trunk/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)