summaryrefslogtreecommitdiffstats
path: root/drivers/net/b44.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/b44.c
parentBUG_ON() Conversion in drivers/s390/net/lcs.c (diff)
downloadlinux-5d9428de1a9785f10a4339f80b717be665ba51c7.tar.xz
linux-5d9428de1a9785f10a4339f80b717be665ba51c7.zip
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/b44.c')
-rw-r--r--drivers/net/b44.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 15032f2c7817..c4e12b5cbb92 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -608,8 +608,7 @@ static void b44_tx(struct b44 *bp)
struct ring_info *rp = &bp->tx_buffers[cons];
struct sk_buff *skb = rp->skb;
- if (unlikely(skb == NULL))
- BUG();
+ BUG_ON(skb == NULL);
pci_unmap_single(bp->pdev,
pci_unmap_addr(rp, mapping),