aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ns83820.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-04-02 13:52:48 +0200
committerAdrian Bunk <bunk@stusta.de>2006-04-02 13:52:48 +0200
commit5d9428de1a9785f10a4339f80b717be665ba51c7 (patch)
tree27eeed8a87ef248cec694032463f0d8f3b38fbcc /drivers/net/ns83820.c
parent7e99e9b66336565f0088ea59d848ab187f9689c3 (diff)
BUG_ON() Conversion in drivers/net/
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r--drivers/net/ns83820.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 8e9b1a537de..706aed7d717 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -568,8 +568,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
#endif
sg = dev->rx_info.descs + (next_empty * DESC_SIZE);
- if (unlikely(NULL != dev->rx_info.skbs[next_empty]))
- BUG();
+ BUG_ON(NULL != dev->rx_info.skbs[next_empty]);
dev->rx_info.skbs[next_empty] = skb;
dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC;