From: Mike McCormack <mikem@ring3k.org>
Date: Mon, 27 Dec 2010 12:50:14 +0000 (+0900)
Subject: Staging: rtl8192e: Remove assert macro
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~884
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d33549a525c737e9ad437638aa9bf812037bdf2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: rtl8192e: Remove assert macro

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 4a83958ac24d..853783762404 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -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 */
 
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 54853ee9e0ef..bace6b346612 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -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))
 	{