Staging: rtl8192e: Remove assert macro
authorMike McCormack <mikem@ring3k.org>
Mon, 27 Dec 2010 12:50:14 +0000 (21:50 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 Jan 2011 00:14:10 +0000 (16:14 -0800)
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8192e/r8192E.h
drivers/staging/rtl8192e/r8192E_core.c

index 4a83958ac24d04a5830bbc4e6263c83da49f61f1..853783762404301d78e72a0b670e491c2a546cce 100644 (file)
@@ -152,11 +152,6 @@ do { if(rt_global_debug_component & component) \
 
 #define RTL819x_DEBUG
 #ifdef RTL819x_DEBUG
-#define assert(expr) \
-        if (!(expr)) {                                  \
-                printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-                #expr,__FILE__,__FUNCTION__,__LINE__);          \
-        }
 //wb added to debug out data buf
 //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA
 #define RT_DEBUG_DATA(level, data, datalen)      \
@@ -174,7 +169,6 @@ do { if(rt_global_debug_component & component) \
                 }                                       \
         } while (0)
 #else
-#define assert(expr) do {} while (0)
 #define RT_DEBUG_DATA(level, data, datalen) do {} while(0)
 #endif /* RTL8169_DEBUG */
 
index 54853ee9e0efc994a647df35ac6c99f469273261..bace6b34661215a63234d34ae3fc985c1ea14edc 100644 (file)
@@ -978,7 +978,7 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
        u8 queue_index = tcb_desc->queue_index;
 
        /* shall not be referred by command packet */
-       assert(queue_index != TXCMD_QUEUE);
+       BUG_ON(queue_index == TXCMD_QUEUE);
 
        if (priv->bHwRadioOff || (!priv->up))
        {