Staging: wlan-ng: Remove WLAN_INCLUDE_DEBUG and some related, mostly unused

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 60820da4aebf94ee85e1fd2e43284539d2e2bf03..036518e3b9cae5e30f3463b034912c8aca03a1af 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -112,7 +112,6 @@
 
 /*================================================================*/
 /* System Includes */
-#define WLAN_DBVAR     prism2_debug
 
 #include <linux/version.h>
 
@@ -170,13 +169,6 @@ typedef enum cmd_mode CMD_MODE;
 
 #define ROUNDUP64(a) (((a)+63)&~63)
 
-/*================================================================*/
-/* Local Types */
-
-/*================================================================*/
-/* Local Static Definitions */
-extern int prism2_debug;
-
 /*================================================================*/
 /* Local Function Declarations */
 

diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 6b98361d5571d650ee45f5774ec5e292a8240eaa..4f314b94f6940e61ebf7b6c18c07fa8e94ef94a3 100644 (file)
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -135,12 +135,6 @@ int wlan_wext_write = 1;
 module_param(wlan_wext_write, int, 0644);
 MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions");
 
-#ifdef WLAN_INCLUDE_DEBUG
-int wlan_debug=0;
-module_param(wlan_debug, int, 0644);
-MODULE_PARM_DESC(wlan_debug, "p80211 debug level");
-#endif
-
 /*================================================================*/
 /* Function Definitions */
 

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index fe4e7ffddf2431f6ad619f89f0ea100fdfae8311..12055226d2c46ea8c77a5f15077f510cff6e3c56 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -59,8 +59,6 @@
 
 /*================================================================*/
 /* System Includes */
-#define WLAN_DBVAR     prism2_debug
-
 
 #include <linux/if_arp.h>
 #include <linux/module.h>

diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h
index 5e326b31815976bd8a4413a459c8643c8f458f3b..b38b16d2893b6411f4a5f0cc2057ec448445badf 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mgmt.h
+++ b/drivers/staging/wlan-ng/prism2mgmt.h
@@ -64,7 +64,6 @@
 /*=============================================================*/
 /*------ Static variable externs ------------------------------*/
 
-extern int     prism2_debug;
 extern int      prism2_reset_holdtime;
 extern int      prism2_reset_settletime;
 /*=============================================================*/

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 08460af4037e6746df411d3d0f33360b1729e025..438c2c29891241f9ef16b6b796f6db9ea22a276f 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -52,7 +52,6 @@
 
 /*================================================================*/
 /* System Includes */
-#define WLAN_DBVAR     prism2_debug
 
 #include <linux/version.h>
 

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 5b3db5c28c1aa8f07e1e148ec1ab6d95615b6f61..b1e4a99f1daaf8ffe31eddabb4f438fbe5a4db8a 100644 (file)
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -52,7 +52,6 @@
 
 /*================================================================*/
 /* System Includes */
-#define WLAN_DBVAR     prism2_debug
 
 #include <linux/version.h>
 #include <linux/module.h>
@@ -115,12 +114,6 @@ int         prism2_reset_settletime=100;   /* Reset settle time in ms */
 
 static int     prism2_doreset=0;               /* Do a reset at init? */
 
-#ifdef WLAN_INCLUDE_DEBUG
-int prism2_debug=0;
-module_param( prism2_debug, int, 0644);
-MODULE_PARM_DESC(prism2_debug, "prism2 debugging");
-#endif
-
 module_param( prism2_doreset, int, 0644);
 MODULE_PARM_DESC(prism2_doreset, "Issue a reset on initialization");
 

diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index 60aaccb11e3ae2e94cec46032d38f05be6eaf6c3..6ea47fc02cac30040e1fd835e13cc7075b1b0768 100644 (file)
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/drivers/staging/wlan-ng/wlan_compat.h
@@ -48,34 +48,20 @@
 #ifndef _WLAN_COMPAT_H
 #define _WLAN_COMPAT_H
 
+#undef netdevice_t
+typedef struct net_device netdevice_t;
+
 /*=============================================================*/
 /*------ OS Portability Macros --------------------------------*/
 /*=============================================================*/
 
-#ifndef WLAN_DBVAR
-#define WLAN_DBVAR     wlan_debug
-#endif
 
 #include <linux/hardirq.h>
 #include <linux/ctype.h>
 
-#if defined(WLAN_INCLUDE_DEBUG)
-       #define WLAN_HEX_DUMP( l, x, p, n)      if( WLAN_DBVAR >= (l) ){ \
-               int __i__; \
-               printk(KERN_DEBUG x ":"); \
-               for( __i__=0; __i__ < (n); __i__++) \
-                       printk( " %02x", ((u8*)(p))[__i__]); \
-               printk("\n"); }
-
-       #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x ,  __func__, (preempt_count() & PREEMPT_MASK), ##args );
-#else
-       #define WLAN_HEX_DUMP( l, s, p, n)
+#define WLAN_HEX_DUMP( l, s, p, n)
 
-       #define WLAN_LOG_DEBUG(l, s, args...)
-#endif
-
-#undef netdevice_t
-typedef struct net_device netdevice_t;
+#define WLAN_LOG_DEBUG(l, s, args...)
 
 /*=============================================================*/
 /*--- General Macros ------------------------------------------*/
@@ -108,8 +94,4 @@ typedef struct net_device netdevice_t;
 /*--- Variables -----------------------------------------------*/
 /*=============================================================*/
 
-#ifdef WLAN_INCLUDE_DEBUG
-extern int wlan_debug;
-#endif
-
 #endif /* _WLAN_COMPAT_H */