Staging: wlan-ng: Replace wlan_isprint() with generic isprint()

[linux-2.6-omap-h63xx.git] / drivers / staging / wlan-ng / wlan_compat.h

diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index d33548a0cb49cb8f1bfd4b96fcb0ae7e6aa75878..60aaccb11e3ae2e94cec46032d38f05be6eaf6c3 100644 (file)
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/drivers/staging/wlan-ng/wlan_compat.h
@@ -57,14 +57,7 @@
 #endif
 
 #include <linux/hardirq.h>
-
-#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args);
-
-#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __func__ , ##args);
-
-#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args);
-
-#define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)
+#include <linux/ctype.h>
 
 #if defined(WLAN_INCLUDE_DEBUG)
        #define WLAN_HEX_DUMP( l, x, p, n)      if( WLAN_DBVAR >= (l) ){ \
@@ -84,18 +77,10 @@
 #undef netdevice_t
 typedef struct net_device netdevice_t;
 
-#define URB_ASYNC_UNLINK 0
-#define USB_QUEUE_BULK 0
-
 /*=============================================================*/
 /*--- General Macros ------------------------------------------*/
 /*=============================================================*/
 
-#define wlan_max(a, b) (((a) > (b)) ? (a) : (b))
-#define wlan_min(a, b) (((a) < (b)) ? (a) : (b))
-
-#define wlan_isprint(c)        (((c) > (0x19)) && ((c) < (0x7f)))
-
 #define wlan_hexchar(x) (((x) < 0x0a) ? ('0' + (x)) : ('a' + ((x) - 0x0a)))
 
 /* Create a string of printable chars from something that might not be */
@@ -106,7 +91,7 @@ typedef struct net_device netdevice_t;
        int j = 0; \
        memset(str, 0, (strlen)); \
        for (i = 0; i < (buflen); i++) { \
-               if ( wlan_isprint((buf)[i]) ) { \
+               if ( isprint((buf)[i]) ) { \
                        (str)[j] = (buf)[i]; \
                        j++; \
                } else { \