leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8192e: Remove assert() macro

Browse Source 
Assert macro printed warning message (and was used once).
Remove it, and add netdev_warn() in place where it was called.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-05-31 20:19:38 +02:00 committed by Greg Kroah-Hartman
parent db65e4aaf5
commit ca93dcba3a
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View File

@ -1885,8 +1885,9 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
return; return;
} }
assert(queue_index != TXCMD_QUEUE); if (queue_index != TXCMD_QUEUE)
netdev_warn(dev, "%s(): queue index != TXCMD_QUEUE\n",
__func__);
memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev)); memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
skb_push(skb, priv->rtllib->tx_headroom); skb_push(skb, priv->rtllib->tx_headroom);

8
drivers/staging/rtl8192e/rtllib_debug.h
View File

@ -76,12 +76,4 @@ do { \
printk(KERN_DEBUG DRV_NAME ":" x "\n", ##args);\ printk(KERN_DEBUG DRV_NAME ":" x "\n", ##args);\
} while (0) } while (0)
#define assert(expr) \
do { \
if (!(expr)) { \
pr_info("Assertion failed! %s,%s,%s,line=%d\n", \
#expr, __FILE__, __func__, __LINE__); \
} \
} while (0)
#endif #endif