From 5a505da957fc2f42ce53e5b0234cdf493f4f3ab0 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Wed, 6 Oct 2010 10:08:03 -0400 Subject: [PATCH] staging: brcm80211: fix checkpatch macro errors. Signed-off-by: Jason Cooper Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmfmac/bcmutils.c | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 9 ++++++--- drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 ++++++--- drivers/staging/brcm80211/brcmfmac/wl_iw.h | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c index 68b57099a154..7185943a3b41 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmutils.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmutils.c @@ -1085,7 +1085,7 @@ static const u8 crc8_table[256] = { }; #define CRC_INNER_LOOP(n, c, x) \ - (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff] + ((c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]) u8 hndcrc8(u8 *pdata, /* pointer to array of data to process */ uint nbytes, /* number of input data bytes to process */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 42e2f2981bb4..3536011533dd 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -337,9 +337,12 @@ uint dhd_radio_up = 1; char iface_name[IFNAMSIZ]; module_param_string(iface_name, iface_name, IFNAMSIZ, 0); -#define DAEMONIZE(a) daemonize(a); \ - allow_signal(SIGKILL); \ - allow_signal(SIGTERM); +#define DAEMONIZE(a) \ + do { \ + daemonize(a); \ + allow_signal(SIGKILL); \ + allow_signal(SIGTERM); \ + } while (0); #define BLOCKABLE() (!in_atomic()) diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index b2514d176353..d9124e258a51 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -107,9 +107,12 @@ static wlc_ssid_t g_specific_ssid; static wlc_ssid_t g_ssid; -#define DAEMONIZE(a) daemonize(a); \ - allow_signal(SIGKILL); \ - allow_signal(SIGTERM); +#define DAEMONIZE(a) \ + do { \ + daemonize(a); \ + allow_signal(SIGKILL); \ + allow_signal(SIGTERM); \ + } while (0); #if defined(WL_IW_USE_ISCAN) #define ISCAN_STATE_IDLE 0 diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h index 805c0902569f..cca4fd7f9e77 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h @@ -76,7 +76,7 @@ typedef struct wl_iw_extra_params { #define WL_FW_RELOAD (SIOCIWFIRSTPRIV+27) #define WL_COMBO_SCAN (SIOCIWFIRSTPRIV+29) #define WL_AP_SPARE3 (SIOCIWFIRSTPRIV+31) -#define G_SCAN_RESULTS 8*1024 +#define G_SCAN_RESULTS (8*1024) #define WE_ADD_EVENT_FIX 0x80 #define G_WLAN_SET_ON 0 #define G_WLAN_SET_OFF 1 -- 2.39.5