---

yaml --- r: 219835 b: refs/heads/master c: fd64bcc h: refs/heads/master i: 219833: 8f1126d 219831: 746131a v: v3
git-mirror · Sep 14, 2010 · fd3a828 · fd3a828
1 parent ac9b2a8
commit fd3a828
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ae3b7ea9f8e7472d26ec317ce498466b0864871
+refs/heads/master: fd64bcc48bd1542ca361e99b6487b54ad10dc4b8
diff --git a/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h
@@ -415,15 +415,15 @@ extern "C" {
 }
 
 #ifndef ABS
-#define	ABS(a)			(((a) < 0)? -(a):(a))
+#define	ABS(a)			(((a) < 0) ? -(a):(a))
 #endif				/* ABS */
 
 #ifndef MIN
-#define	MIN(a, b)		(((a) < (b))?(a):(b))
+#define	MIN(a, b)		(((a) < (b)) ? (a):(b))
 #endif				/* MIN */
 
 #ifndef MAX
-#define	MAX(a, b)		(((a) > (b))?(a):(b))
+#define	MAX(a, b)		(((a) > (b)) ? (a):(b))
 #endif				/* MAX */
 
 #define CEIL(x, y)		(((x) + ((y)-1)) / (y))

diff --git a/trunk/drivers/staging/brcm80211/include/bitfuncs.h b/trunk/drivers/staging/brcm80211/include/bitfuncs.h
@@ -38,7 +38,7 @@ static INLINE uint32 find_msbit(uint32 x);
 static INLINE uint32 find_msbit(uint32 x)
 {
 	uint msbit;
- __asm__("bsrl %1,%0":"=r"(msbit)
+ __asm__("bsrl %1,%0" : "=r"(msbit)
  :		"r"(x));
 	return msbit;
 }

diff --git a/trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
@@ -971,7 +971,7 @@ uint16
 
 #define LCNPHY_IQLOCC_READ(val) ((uint8)(-(int8)(((val) & 0xf0) >> 4) + (int8)((val) & 0x0f)))
 #define FIXED_TXPWR 78
-#define LCNPHY_TEMPSENSE(val) ((int16)((val > 255)?(val - 512):val))
+#define LCNPHY_TEMPSENSE(val) ((int16)((val > 255) ? (val - 512) : val))
 
 static uint32 wlc_lcnphy_qdiv_roundup(uint32 divident, uint32 divisor,
 				      uint8 precision);

diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -1612,13 +1612,13 @@ static void __devexit wl_remove(struct pci_dev *pdev)
 
 static struct pci_driver wl_pci_driver = {
  name:	"brcm80211",
- probe:wl_pci_probe,
+ probe: wl_pci_probe,
 #ifdef LINUXSTA_PS
- suspend:wl_suspend,
- resume:wl_resume,
+ suspend: wl_suspend,
+ resume:  wl_resume,
 #endif				/* LINUXSTA_PS */
- remove:__devexit_p(wl_remove),
- id_table:wl_id_table,
+ remove:   __devexit_p(wl_remove),
+ id_table: wl_id_table,
 };
 #endif				/* !BCMSDIO */
 

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_channel.h b/trunk/drivers/staging/brcm80211/sys/wlc_channel.h
@@ -47,7 +47,7 @@ struct wlc_info;
 
 /* macro to get 5 GHz channel group index for tx power */
 #define CHANNEL_POWER_IDX_5G(c) \
-	(((c) < 52) ? 0 : (((c) < 62) ? 1 :(((c) < 100) ? 2 : (((c) < 149) ? 3 : 4))))
+	(((c) < 52) ? 0 : (((c) < 62) ? 1 : (((c) < 100) ? 2 : (((c) < 149) ? 3 : 4))))
 
 #define WLC_MAXPWR_TBL_SIZE		6	/* max of BAND_5G_PWR_LVLS and 6 for 2.4 GHz */
 #define WLC_MAXPWR_MIMO_TBL_SIZE	14	/* max of BAND_5G_PWR_LVLS and 14 for 2.4 GHz */

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -834,7 +834,7 @@ struct antsel_info {
 };
 
 #define	CHANNEL_BANDUNIT(wlc, ch) (((ch) <= CH_MAX_2G_CHANNEL) ? BAND_2G_INDEX : BAND_5G_INDEX)
-#define	OTHERBANDUNIT(wlc)	((uint)((wlc)->band->bandunit? BAND_2G_INDEX : BAND_5G_INDEX))
+#define	OTHERBANDUNIT(wlc)	((uint)((wlc)->band->bandunit ? BAND_2G_INDEX : BAND_5G_INDEX))
 
 #define IS_MBAND_UNLOCKED(wlc) \
 	((NBANDS(wlc) > 1) && !(wlc)->bandlocked)

diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_pub.h b/trunk/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -452,7 +452,7 @@ typedef struct {
 #define WLPKTFLAG_RIFS(pkttag)	((pkttag)->flags & WLF_RIFS)
 
 /* API for accessing BSSCFG index in WLPKTTAG */
-#define BSSCFGIDX_ISVALID(bsscfgidx) (((bsscfgidx >= 0)&&(bsscfgidx < WLC_MAXBSSCFG)) ? 1 : 0)
+#define BSSCFGIDX_ISVALID(bsscfgidx) (((bsscfgidx >= 0) && (bsscfgidx < WLC_MAXBSSCFG)) ? 1 : 0)
 
 static INLINE int8 wlc_pkttag_bsscfg_get(void *p)
 {