From 914d69d6bc5758b57f46a33699d794a364db88b9 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Tue, 14 Sep 2010 09:45:46 -0400 Subject: [PATCH] staging: brcm80211: fix "ERROR: space required after that ..." Signed-off-by: Jason Cooper Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/sys/wl_dbg.h | 24 ++++++++++++------------ drivers/staging/brcm80211/sys/wl_mac80211.h | 4 ++-- drivers/staging/brcm80211/sys/wlc_key.h | 2 +- drivers/staging/brcm80211/sys/wlc_pub.h | 4 ++-- drivers/staging/brcm80211/sys/wlc_scb.h | 4 ++-- drivers/staging/brcm80211/util/bcmotp.c | 2 +- drivers/staging/brcm80211/util/hndpmu.c | 9 ++++++--- 7 files changed, 26 insertions(+), 23 deletions(-) diff --git a/drivers/staging/brcm80211/sys/wl_dbg.h b/drivers/staging/brcm80211/sys/wl_dbg.h index 7dd741a..d83244c 100644 --- a/drivers/staging/brcm80211/sys/wl_dbg.h +++ b/drivers/staging/brcm80211/sys/wl_dbg.h @@ -25,10 +25,10 @@ extern uint32 wl_msg_level; #ifdef BCMDBG -#define WL_ERROR(args) do {if ((wl_msg_level & WL_ERROR_VAL)) WL_PRINT(args);} while (0) -#define WL_TRACE(args) do {if (wl_msg_level & WL_TRACE_VAL) WL_PRINT(args);} while (0) -#define WL_AMPDU(args) do {if (wl_msg_level & WL_AMPDU_VAL) WL_PRINT(args);} while (0) -#define WL_FFPLD(args) do {if (wl_msg_level & WL_FFPLD_VAL) WL_PRINT(args);} while (0) +#define WL_ERROR(args) do {if ((wl_msg_level & WL_ERROR_VAL)) WL_PRINT(args); } while (0) +#define WL_TRACE(args) do {if (wl_msg_level & WL_TRACE_VAL) WL_PRINT(args); } while (0) +#define WL_AMPDU(args) do {if (wl_msg_level & WL_AMPDU_VAL) WL_PRINT(args); } while (0) +#define WL_FFPLD(args) do {if (wl_msg_level & WL_FFPLD_VAL) WL_PRINT(args); } while (0) #define WL_ERROR_ON() (wl_msg_level & WL_ERROR_VAL) @@ -44,14 +44,14 @@ extern uint32 wl_msg_level; extern uint32 wl_ampdu_dbg; -#define WL_AMPDU_UPDN(args) do {if (wl_ampdu_dbg & WL_AMPDU_UPDN_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_RX(args) do {if (wl_ampdu_dbg & WL_AMPDU_RX_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_ERR(args) do {if (wl_ampdu_dbg & WL_AMPDU_ERR_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_TX(args) do {if (wl_ampdu_dbg & WL_AMPDU_TX_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_CTL(args) do {if (wl_ampdu_dbg & WL_AMPDU_CTL_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_HW(args) do {if (wl_ampdu_dbg & WL_AMPDU_HW_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_HWTXS(args) do {if (wl_ampdu_dbg & WL_AMPDU_HWTXS_VAL) {WL_AMPDU(args);} } while (0) -#define WL_AMPDU_HWDBG(args) do {if (wl_ampdu_dbg & WL_AMPDU_HWDBG_VAL) {WL_AMPDU(args);} } while (0) +#define WL_AMPDU_UPDN(args) do {if (wl_ampdu_dbg & WL_AMPDU_UPDN_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_RX(args) do {if (wl_ampdu_dbg & WL_AMPDU_RX_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_ERR(args) do {if (wl_ampdu_dbg & WL_AMPDU_ERR_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_TX(args) do {if (wl_ampdu_dbg & WL_AMPDU_TX_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_CTL(args) do {if (wl_ampdu_dbg & WL_AMPDU_CTL_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_HW(args) do {if (wl_ampdu_dbg & WL_AMPDU_HW_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_HWTXS(args) do {if (wl_ampdu_dbg & WL_AMPDU_HWTXS_VAL) {WL_AMPDU(args); } } while (0) +#define WL_AMPDU_HWDBG(args) do {if (wl_ampdu_dbg & WL_AMPDU_HWDBG_VAL) {WL_AMPDU(args); } } while (0) #define WL_AMPDU_ERR_ON() (wl_ampdu_dbg & WL_AMPDU_ERR_VAL) #define WL_AMPDU_HW_ON() (wl_ampdu_dbg & WL_AMPDU_HW_VAL) #define WL_AMPDU_HWTXS_ON() (wl_ampdu_dbg & WL_AMPDU_HWTXS_VAL) diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h index dcac7f5..a6c13a3 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.h +++ b/drivers/staging/brcm80211/sys/wl_mac80211.h @@ -126,8 +126,8 @@ struct wl_info { #define WL_UNLOCK(wl) spin_unlock_bh(&(wl)->lock) /* locking from inside wl_isr */ -#define WL_ISRLOCK(wl, flags) do {spin_lock(&(wl)->isr_lock); (void)(flags);} while (0) -#define WL_ISRUNLOCK(wl, flags) do {spin_unlock(&(wl)->isr_lock); (void)(flags);} while (0) +#define WL_ISRLOCK(wl, flags) do {spin_lock(&(wl)->isr_lock); (void)(flags); } while (0) +#define WL_ISRUNLOCK(wl, flags) do {spin_unlock(&(wl)->isr_lock); (void)(flags); } while (0) /* locking under WL_LOCK() to synchronize with wl_isr */ #define INT_LOCK(wl, flags) spin_lock_irqsave(&(wl)->isr_lock, flags) diff --git a/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h index 0abc958..a53a11fe 100644 --- a/drivers/staging/brcm80211/sys/wlc_key.h +++ b/drivers/staging/brcm80211/sys/wlc_key.h @@ -130,7 +130,7 @@ typedef struct { #define wlc_key_hw_wowl_init(a, b, c, d) do {} while (0) #define wlc_key_sw_wowl_update(a, b, c, d, e) do {} while (0) #define wlc_key_sw_wowl_create(a, b, c) (BCME_ERROR) -#define wlc_key_iv_update(a, b, c, d, e) do {(void)e;} while (0) +#define wlc_key_iv_update(a, b, c, d, e) do {(void)e; } while (0) #define wlc_key_iv_init(a, b, c) do {} while (0) #define wlc_key_set_error(a, b, c) (BCME_ERROR) #define wlc_key_dump_hw(a, b) (BCME_ERROR) diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h index fdf854f..16fc885 100644 --- a/drivers/staging/brcm80211/sys/wlc_pub.h +++ b/drivers/staging/brcm80211/sys/wlc_pub.h @@ -566,8 +566,8 @@ extern const uint8 wme_fifo2ac[]; #define WLC_UPDATE_STATS(wlc) 0 /* No stats support */ #define WLCNTINCR(a) /* No stats support */ #define WLCNTDECR(a) /* No stats support */ -#define WLCNTADD(a,delta) /* No stats support */ -#define WLCNTSET(a,value) /* No stats support */ +#define WLCNTADD(a, delta) /* No stats support */ +#define WLCNTSET(a, value) /* No stats support */ #define WLCNTVAL(a) 0 /* No stats support */ /* common functions for every port */ diff --git a/drivers/staging/brcm80211/sys/wlc_scb.h b/drivers/staging/brcm80211/sys/wlc_scb.h index 9208bd5..5634796 100644 --- a/drivers/staging/brcm80211/sys/wlc_scb.h +++ b/drivers/staging/brcm80211/sys/wlc_scb.h @@ -201,8 +201,8 @@ struct scb { #define WLCNTSCBINCR(a) /* No stats support */ #define WLCNTSCBDECR(a) /* No stats support */ -#define WLCNTSCBADD(a,delta) /* No stats support */ -#define WLCNTSCBSET(a,value) /* No stats support */ +#define WLCNTSCBADD(a, delta) /* No stats support */ +#define WLCNTSCBSET(a, value) /* No stats support */ #define WLCNTSCBVAL(a) 0 /* No stats support */ #define WLCNTSCB_COND_SET(c, a, v) /* No stats support */ #define WLCNTSCB_COND_ADD(c, a, d) /* No stats support */ diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c index 1c6c57b..a63214f 100644 --- a/drivers/staging/brcm80211/util/bcmotp.c +++ b/drivers/staging/brcm80211/util/bcmotp.c @@ -149,7 +149,7 @@ static otpinfo_t otpinfo; #define OTPGU_P_SHIFT (OTPGU_HWP_OFF % 16) /* OTP Size */ -#define OTP_SZ_FU_324 ((ROUNDUP(324,8))/8) /* 324 bits */ +#define OTP_SZ_FU_324 ((ROUNDUP(324, 8))/8) /* 324 bits */ #define OTP_SZ_FU_288 (288/8) /* 288 bits */ #define OTP_SZ_FU_216 (216/8) /* 216 bits */ #define OTP_SZ_FU_72 (72/8) /* 72 bits */ diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index 9517de9..daa0198 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -1875,7 +1875,8 @@ static const sdiod_drive_str_t BCMINITDATA(sdiod_drive_strength_tab1)[] = { 4, 0x2}, { 2, 0x3}, { 1, 0x0}, { -0, 0x0} }; + 0, 0x0} + }; /* SDIO Drive Strength to sel value table for PMU Rev 2, 3 */ static const sdiod_drive_str_t BCMINITDATA(sdiod_drive_strength_tab2)[] = { @@ -1886,7 +1887,8 @@ static const sdiod_drive_str_t BCMINITDATA(sdiod_drive_strength_tab2)[] = { 6, 0x4}, { 4, 0x2}, { 2, 0x1}, { -0, 0x0} }; + 0, 0x0} + }; /* SDIO Drive Strength to sel value table for PMU Rev 8 (1.8V) */ static const sdiod_drive_str_t BCMINITDATA(sdiod_drive_strength_tab3)[] = { @@ -1898,7 +1900,8 @@ static const sdiod_drive_str_t BCMINITDATA(sdiod_drive_strength_tab3)[] = { 12, 0x3}, { 8, 0x2}, { 4, 0x1}, { -0, 0x0} }; + 0, 0x0} + }; #define SDIOD_DRVSTR_KEY(chip, pmu) (((chip) << 16) | (pmu)) -- 2.7.4