staging: brcm80211: fix "ERROR: spaces required around that ..."

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index 51caf3c7eaea41bfc718a352861e9fff42ba735e..67fe99cb5b9ac636aa330a840928ddc353da4593 100644 (file)
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/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/drivers/staging/brcm80211/include/bitfuncs.h b/drivers/staging/brcm80211/include/bitfuncs.h
index ecde921fb5175d6704f212cef8b7876ace1f768b..28940d90530689b32d20e67335a8ca73b2e05a9b 100644 (file)
--- a/drivers/staging/brcm80211/include/bitfuncs.h
+++ b/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/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
index ef27750bf47c20c945ed7898c92fd67add354d8a..c34d06bf69e38c827253c1a2e060d61baca4fe36 100644 (file)
--- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
+++ b/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/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index 2ccfcf7c1db63198e87bb5cc667be123f4f679dc..adcac6dddf920cb01683540b195b48460297eef4 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/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/drivers/staging/brcm80211/sys/wlc_channel.h b/drivers/staging/brcm80211/sys/wlc_channel.h
index 3d07ac80756f2cddd899461a7979a39471071b8a..6ad80537c61506467854005028430185172d83ca 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_channel.h
+++ b/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/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h
index 9759a9e9fe21065e8bdf8a8e789ff9234b3c1252..cf6ce4214f8182ba2fcae848e576c97a237646df 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/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/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index 16fc885265852ed8e37e5f6f79b0ee4ca2366c22..e01e6ed57f4a46edf7d07d8e3c331d96b1bf13c7 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/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)
 {