aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2010-09-14 09:45:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-14 19:23:40 -0400
commit7e85c72969b17eed698c3e23674f424bf345aceb (patch)
treece9dd0973f2d5a492896696f90a5a10c1060cc14
parente4e4d21fa303f71a8289c3dd822a02cf91603502 (diff)
staging: brcm80211: fix "ERROR: do not initialise statics to 0 or NULL"
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/sys/wl_mac80211.c10
-rw-r--r--drivers/staging/brcm80211/util/bcmutils.c2
-rw-r--r--drivers/staging/brcm80211/util/hnddma.c2
-rw-r--r--drivers/staging/brcm80211/util/hndpmu.c2
-rw-r--r--drivers/staging/brcm80211/util/nvram/nvram_ro.c2
-rw-r--r--drivers/staging/brcm80211/util/siutils.c2
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index b92942f1d67..b6b4c6ad9e5 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -128,7 +128,7 @@ static int wl_linux_watchdog(void *ctx);
128 FIF_OTHER_BSS | \ 128 FIF_OTHER_BSS | \
129 FIF_BCN_PRBRESP_PROMISC) 129 FIF_BCN_PRBRESP_PROMISC)
130 130
131static int wl_found = 0; 131static int wl_found;
132 132
133struct ieee80211_tkip_data { 133struct ieee80211_tkip_data {
134#define TKIP_KEY_LEN 32 134#define TKIP_KEY_LEN 32
@@ -203,17 +203,17 @@ module_param(phymsglevel, int, 0);
203#endif /* WLC_HIGH_ONLY */ 203#endif /* WLC_HIGH_ONLY */
204#endif /* BCMDBG */ 204#endif /* BCMDBG */
205 205
206static int oneonly = 0; 206static int oneonly;
207module_param(oneonly, int, 0); 207module_param(oneonly, int, 0);
208 208
209static int piomode = 0; 209static int piomode;
210module_param(piomode, int, 0); 210module_param(piomode, int, 0);
211 211
212static int instance_base = 0; /* Starting instance number */ 212static int instance_base; /* Starting instance number */
213module_param(instance_base, int, 0); 213module_param(instance_base, int, 0);
214 214
215#if defined(BCMDBG) 215#if defined(BCMDBG)
216static char *macaddr = NULL; 216static char *macaddr;
217module_param(macaddr, charp, S_IRUGO); 217module_param(macaddr, charp, S_IRUGO);
218#endif 218#endif
219 219
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 056fcaf52bf..cff4d030c80 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -29,7 +29,7 @@
29 29
30#ifdef WLC_LOW 30#ifdef WLC_LOW
31/* nvram vars cache */ 31/* nvram vars cache */
32static char *nvram_vars = NULL; 32static char *nvram_vars;
33static int vars_len = -1; 33static int vars_len = -1;
34#endif /* WLC_LOW */ 34#endif /* WLC_LOW */
35 35
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 837c97ffafb..7c2ed272d0a 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -48,7 +48,7 @@
48#define rxd64 dregs.d64_u.rxd_64 48#define rxd64 dregs.d64_u.rxd_64
49 49
50/* default dma message level (if input msg_level pointer is null in dma_attach()) */ 50/* default dma message level (if input msg_level pointer is null in dma_attach()) */
51static uint dma_msg_level = 0; 51static uint dma_msg_level;
52 52
53#define MAXNAMEL 8 /* 8 char names */ 53#define MAXNAMEL 8 /* 8 char names */
54 54
diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index 2d244f88470..fab07fe9306 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/util/hndpmu.c
@@ -1840,7 +1840,7 @@ uint32 BCMINITFN(si_pmu_mem_clock) (si_t *sih, osl_t *osh)
1840/* Measure ILP clock frequency */ 1840/* Measure ILP clock frequency */
1841#define ILP_CALC_DUR 10 /* ms, make sure 1000 can be divided by it. */ 1841#define ILP_CALC_DUR 10 /* ms, make sure 1000 can be divided by it. */
1842 1842
1843static uint32 ilpcycles_per_sec = 0; 1843static uint32 ilpcycles_per_sec;
1844 1844
1845uint32 BCMINITFN(si_pmu_ilp_clock) (si_t *sih, osl_t *osh) 1845uint32 BCMINITFN(si_pmu_ilp_clock) (si_t *sih, osl_t *osh)
1846{ 1846{
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index 86832e1a591..f6640ef8fb9 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@ -38,7 +38,7 @@ typedef struct _vars {
38 38
39#define VARS_T_OH sizeof(vars_t) 39#define VARS_T_OH sizeof(vars_t)
40 40
41static vars_t *vars = NULL; 41static vars_t *vars;
42 42
43#define NVRAM_FILE 1 43#define NVRAM_FILE 1
44 44
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index b60bc3bda5a..08393ee1efa 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -69,7 +69,7 @@ static uint BCMINITFN(socram_banksize) (si_info_t *sii, sbsocramregs_t *r,
69 uint8 idx, uint8 mtype); 69 uint8 idx, uint8 mtype);
70 70
71/* global variable to indicate reservation/release of gpio's */ 71/* global variable to indicate reservation/release of gpio's */
72static uint32 si_gpioreservation = 0; 72static uint32 si_gpioreservation;
73 73
74/* global flag to prevent shared resources from being initialized multiple times in si_attach() */ 74/* global flag to prevent shared resources from being initialized multiple times in si_attach() */
75 75