aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2010-10-06 10:08:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-06 11:20:42 -0400
commit5a505da957fc2f42ce53e5b0234cdf493f4f3ab0 (patch)
tree7b2db992d36af35288de3255763f3030ae84ad92
parente9887c9d9c37b8af80ae04aad1532d5c46687f8b (diff)
staging: brcm80211: fix checkpatch macro errors.
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmfmac/bcmutils.c2
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_linux.c9
-rw-r--r--drivers/staging/brcm80211/brcmfmac/wl_iw.c9
-rw-r--r--drivers/staging/brcm80211/brcmfmac/wl_iw.h2
4 files changed, 14 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c
index 68b57099a15..7185943a3b4 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] = {
1085}; 1085};
1086 1086
1087#define CRC_INNER_LOOP(n, c, x) \ 1087#define CRC_INNER_LOOP(n, c, x) \
1088 (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff] 1088 ((c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff])
1089 1089
1090u8 hndcrc8(u8 *pdata, /* pointer to array of data to process */ 1090u8 hndcrc8(u8 *pdata, /* pointer to array of data to process */
1091 uint nbytes, /* number of input data bytes to process */ 1091 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 42e2f2981bb..3536011533d 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;
337char iface_name[IFNAMSIZ]; 337char iface_name[IFNAMSIZ];
338module_param_string(iface_name, iface_name, IFNAMSIZ, 0); 338module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
339 339
340#define DAEMONIZE(a) daemonize(a); \ 340#define DAEMONIZE(a) \
341 allow_signal(SIGKILL); \ 341 do { \
342 allow_signal(SIGTERM); 342 daemonize(a); \
343 allow_signal(SIGKILL); \
344 allow_signal(SIGTERM); \
345 } while (0);
343 346
344#define BLOCKABLE() (!in_atomic()) 347#define BLOCKABLE() (!in_atomic())
345 348
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index b2514d17635..d9124e258a5 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;
107 107
108static wlc_ssid_t g_ssid; 108static wlc_ssid_t g_ssid;
109 109
110#define DAEMONIZE(a) daemonize(a); \ 110#define DAEMONIZE(a) \
111 allow_signal(SIGKILL); \ 111 do { \
112 allow_signal(SIGTERM); 112 daemonize(a); \
113 allow_signal(SIGKILL); \
114 allow_signal(SIGTERM); \
115 } while (0);
113 116
114#if defined(WL_IW_USE_ISCAN) 117#if defined(WL_IW_USE_ISCAN)
115#define ISCAN_STATE_IDLE 0 118#define ISCAN_STATE_IDLE 0
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
index 805c0902569..cca4fd7f9e7 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 {
76#define WL_FW_RELOAD (SIOCIWFIRSTPRIV+27) 76#define WL_FW_RELOAD (SIOCIWFIRSTPRIV+27)
77#define WL_COMBO_SCAN (SIOCIWFIRSTPRIV+29) 77#define WL_COMBO_SCAN (SIOCIWFIRSTPRIV+29)
78#define WL_AP_SPARE3 (SIOCIWFIRSTPRIV+31) 78#define WL_AP_SPARE3 (SIOCIWFIRSTPRIV+31)
79#define G_SCAN_RESULTS 8*1024 79#define G_SCAN_RESULTS (8*1024)
80#define WE_ADD_EVENT_FIX 0x80 80#define WE_ADD_EVENT_FIX 0x80
81#define G_WLAN_SET_ON 0 81#define G_WLAN_SET_ON 0
82#define G_WLAN_SET_OFF 1 82#define G_WLAN_SET_OFF 1