Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG_ON() Conversion in drivers/isdn

Browse Source 
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>
This commit is contained in:
Eric Sesterhenn 2006-03-26 18:19:26 +02:00 committed by Adrian Bunk
parent 56ee48277f
commit 6dd44a7446
5 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/isdn/hisax/hisax_fcpcipnp.c
View File

@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs)
DBG(0x40, "hdlc_fill_fifo");
if (skb->len == 0)
BUG();
BUG_ON(skb->len == 0);
bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME;
if (bcs->tx_skb->len > bcs->fifo_size) {
@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
switch (pr) {
case PH_DATA | REQUEST:
if (bcs->tx_skb)
BUG();
BUG_ON(bcs->tx_skb);
bcs->tx_skb = skb;
DBG_SKB(1, skb);
hdlc_fill_fifo(bcs);

9
drivers/isdn/hisax/hisax_isac.c
View File

@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *isac)
unsigned char cmd;
u_char *ptr;
if (!isac->tx_skb)
BUG();
BUG_ON(!isac->tx_skb);
count = isac->tx_skb->len;
if (count <= 0)
BUG();
BUG_ON(count <= 0);
DBG(DBG_IRQ, "count %d", count);
@ -859,8 +857,7 @@ void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
dev_kfree_skb(skb);
break;
}
if (isac->tx_skb)
BUG();
BUG_ON(isac->tx_skb);
isac->tx_skb = skb;
isac_fill_fifo(isac);

4
drivers/isdn/hisax/st5481_b.c
View File

@ -356,9 +356,7 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
switch (pr) {
case PH_DATA | REQUEST:
if (bcs->b_out.tx_skb)
BUG();
BUG_ON(bcs->b_out.tx_skb);
bcs->b_out.tx_skb = skb;
break;
case PH_ACTIVATE | REQUEST:

4
drivers/isdn/hisax/st5481_d.c
View File

@ -596,9 +596,7 @@ void st5481_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
break;
case PH_DATA | REQUEST:
DBG(2, "PH_DATA REQUEST len %d", skb->len);
if (adapter->d_out.tx_skb)
BUG();
BUG_ON(adapter->d_out.tx_skb);
adapter->d_out.tx_skb = skb;
FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL);
break;

6
drivers/isdn/i4l/isdn_ppp.c
View File

@ -974,8 +974,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf
int slot;
int proto;
if (net_dev->local->master)
BUG(); // we're called with the master device always
BUG_ON(net_dev->local->master); // we're called with the master device always
slot = lp->ppp_slot;
if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
@ -2527,8 +2526,7 @@ static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struc
printk(KERN_DEBUG "ippp: no decompressor defined!\n");
return skb;
}
if (!stat) // if we have a compressor, stat has been set as well
BUG();
BUG_ON(!stat); // if we have a compressor, stat has been set as well
if((master && *proto == PPP_COMP) || (!master && *proto == PPP_COMPFRAG) ) {
// compressed packets are compressed by their protocol type