[PATCH] staging: brcm80211: fix checkpatch warnings found in previous commit

Arend van Spriel arend at broadcom.com
Thu Apr 14 18:26:45 UTC 2011


This commit gets rid of checkpatch warnings observed in previous
commit posted with title: rename rate related definitions.

Reviewed-by: Roland Vossen <rvossen at broadcom.com>
Reviewed-by: Henry Ptasinski <henryp at broadcom.com>
Signed-off-by: Arend van Spriel <arend at broadcom.com>
---
 drivers/staging/brcm80211/brcmsmac/wlc_rate.h |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.h b/drivers/staging/brcm80211/brcmsmac/wlc_rate.h
index 5643adf..f406a79 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.h
@@ -55,11 +55,11 @@ extern const mcs_info_t mcs_table[];
 #define VALID_MCS(_mcs)	((_mcs < MCS_TABLE_SIZE))
 
 /* rate related definitions */
-#define	WLC_RATE_FLAG	0x80	/* Rate flag: basic or ofdm */
+#define	WLC_RATE_FLAG	0x80	/* Rate flag to indicate it is a basic rate */
 #define	WLC_RATE_MASK	0x7f	/* Rate value mask w/o basic rate flag */
 
 /* Macro to use in the rate_info table */
-#define	WLC_RATE_MASK_FULL	0xff	/* Rate value mask with basic rate flag */
+#define	WLC_RATE_MASK_FULL	0xff /* Rate value mask with basic rate flag */
 
 #define WLC_RATE_500K_TO_BPS(rate)	((rate) * 500000)	/* convert 500kbps to bps */
 
@@ -116,9 +116,11 @@ typedef u32 ratespec_t;
 /* Rate info table; takes a legacy rate or ratespec_t */
 #define	IS_MCS(r)     	(r & RSPEC_MIMORATE)
 #define	IS_OFDM(r)     	(!IS_MCS(r) && (rate_info[(r) & RSPEC_RATE_MASK] & WLC_RATE_FLAG))
-#define	IS_CCK(r)	(!IS_MCS(r) && (((r) & WLC_RATE_MASK) == WLC_RATE_1M || \
+#define	IS_CCK(r)	(!IS_MCS(r) && ( \
+			 ((r) & WLC_RATE_MASK) == WLC_RATE_1M || \
 			 ((r) & WLC_RATE_MASK) == WLC_RATE_2M || \
-			 ((r) & WLC_RATE_MASK) == WLC_RATE_5M5 || ((r) & WLC_RATE_MASK) == WLC_RATE_11M))
+			 ((r) & WLC_RATE_MASK) == WLC_RATE_5M5 || \
+			 ((r) & WLC_RATE_MASK) == WLC_RATE_11M))
 #define IS_SINGLE_STREAM(mcs)	(((mcs) <= HIGHEST_SINGLE_STREAM_MCS) || ((mcs) == 32))
 #define CCK_RSPEC(cck)		((cck) & RSPEC_RATE_MASK)
 #define OFDM_RSPEC(ofdm)	(((ofdm) & RSPEC_RATE_MASK) |\
-- 
1.7.1





More information about the devel mailing list