Commit 76f9a428 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: wlags49_h2: debug.h: remove typedef for debug structure

Also move the variable definition into the .h file, so it doesn't have
to be declared in each .c file individually, which is crazy.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e1eb789
...@@ -165,11 +165,13 @@ ...@@ -165,11 +165,13 @@
#C, __FILE__, __LINE__, __func__); \ #C, __FILE__, __LINE__, __func__); \
} } while (0) } } while (0)
typedef struct { struct dbg_info {
char *dbgName; char *dbgName;
int dbgLevel; int dbgLevel;
unsigned long DebugFlag; unsigned long DebugFlag;
} dbg_info_t; };
extern struct dbg_info *DbgInfo;
/****************************************************************************/ /****************************************************************************/
......
...@@ -100,15 +100,6 @@ ...@@ -100,15 +100,6 @@
#include <wl_netdev.h> #include <wl_netdev.h>
#include <wl_cs.h> #include <wl_cs.h>
/*******************************************************************************
* global definitions
******************************************************************************/
#if DBG
extern dbg_info_t *DbgInfo;
#endif /* DBG */
/******************************************************************************* /*******************************************************************************
* wl_adapter_attach() * wl_adapter_attach()
******************************************************************************* *******************************************************************************
......
...@@ -70,21 +70,6 @@ ...@@ -70,21 +70,6 @@
#include <wl_enc.h> #include <wl_enc.h>
/*******************************************************************************
* global definitions
******************************************************************************/
#if DBG
extern dbg_info_t *DbgInfo;
#endif /* DBG */
/******************************************************************************* /*******************************************************************************
* wl_wep_code() * wl_wep_code()
******************************************************************************* *******************************************************************************
......
...@@ -400,8 +400,8 @@ static p_u32 pc_debug = DBG_LVL; ...@@ -400,8 +400,8 @@ static p_u32 pc_debug = DBG_LVL;
*/ p_u32 DebugFlag = ~0; //recognizable "undefined value" rather then DBG_DEFAULTS; */ p_u32 DebugFlag = ~0; //recognizable "undefined value" rather then DBG_DEFAULTS;
//MODULE_PARM(DebugFlag, "l"); //MODULE_PARM(DebugFlag, "l");
dbg_info_t wl_info = { KBUILD_MODNAME, 0, 0 }; static struct dbg_info wl_info = { KBUILD_MODNAME, 0, 0 };
dbg_info_t *DbgInfo = &wl_info; struct dbg_info *DbgInfo = &wl_info;
#endif /* DBG */ #endif /* DBG */
#ifdef USE_RTS #ifdef USE_RTS
......
...@@ -115,14 +115,6 @@ ...@@ -115,14 +115,6 @@
#endif /* BUS_PCI */ #endif /* BUS_PCI */
/*******************************************************************************
* global variables
******************************************************************************/
#if DBG
extern dbg_info_t *DbgInfo;
#endif /* DBG */
#if HCF_ENCAP #if HCF_ENCAP
#define MTU_MAX (HCF_MAX_MSG - ETH_HLEN - 8) #define MTU_MAX (HCF_MAX_MSG - ETH_HLEN - 8)
#else #else
......
...@@ -101,14 +101,6 @@ ...@@ -101,14 +101,6 @@
#include <wireless/wl_netdev.h> #include <wireless/wl_netdev.h>
#include <wireless/wl_pci.h> #include <wireless/wl_pci.h>
/*******************************************************************************
* global variables
******************************************************************************/
#if DBG
extern dbg_info_t *DbgInfo;
#endif // DBG
/* define the PCI device Table Cardname and id tables */ /* define the PCI device Table Cardname and id tables */
static struct pci_device_id wl_pci_tbl[] = { static struct pci_device_id wl_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), }, { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), },
......
...@@ -94,16 +94,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp); ...@@ -94,16 +94,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp);
int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp); int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp);
/*******************************************************************************
* global variables
******************************************************************************/
#if DBG
extern dbg_info_t *DbgInfo;
#endif /* DBG */
/* If USE_UIL is not defined, then none of the UIL Interface code below will /* If USE_UIL is not defined, then none of the UIL Interface code below will
be included in the build */ be included in the build */
#ifdef USE_UIL #ifdef USE_UIL
......
...@@ -101,16 +101,11 @@ ...@@ -101,16 +101,11 @@
#include <wl_profile.h> #include <wl_profile.h>
/*******************************************************************************
* global variables
******************************************************************************/
/* Definition needed to prevent unresolved external in unistd.h */ /* Definition needed to prevent unresolved external in unistd.h */
static int errno; static int errno;
#if DBG #if DBG
extern p_u32 DebugFlag; extern p_u32 DebugFlag;
extern dbg_info_t *DbgInfo;
#endif #endif
int parse_yes_no(char *value); int parse_yes_no(char *value);
......
...@@ -128,13 +128,6 @@ static const long chan_freq_list[][2] = ...@@ -128,13 +128,6 @@ static const long chan_freq_list[][2] =
{161,5805} {161,5805}
}; };
#if DBG
extern dbg_info_t *DbgInfo;
#endif /* DBG */
/******************************************************************************* /*******************************************************************************
* dbm() * dbm()
******************************************************************************* *******************************************************************************
......
...@@ -76,14 +76,6 @@ ...@@ -76,14 +76,6 @@
#include <wl_wext.h> #include <wl_wext.h>
#include <wl_priv.h> #include <wl_priv.h>
/*******************************************************************************
* global definitions
******************************************************************************/
#if DBG
extern dbg_info_t *DbgInfo;
#endif // DBG
/* Set up the LTV to program the appropriate key */ /* Set up the LTV to program the appropriate key */
static int hermes_set_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr, static int hermes_set_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr,
int set_tx, u8 *seq, u8 *key, size_t key_len) int set_tx, u8 *seq, u8 *key, size_t key_len)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment