diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-26 18:19:26 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-03-26 18:19:26 +0200 |
| commit | 6dd44a74469c203c5106ada2082c46267b4ac674 (patch) | |
| tree | dfc0b29c97b3147cecfcc874c1ae952b25841c71 /drivers/isdn/i4l | |
| parent | 56ee48277fa214b3b7b0fd91e7fd3464e12597de (diff) | |
| download | kernel_samsung_smdk4412-6dd44a74469c203c5106ada2082c46267b4ac674.zip kernel_samsung_smdk4412-6dd44a74469c203c5106ada2082c46267b4ac674.tar.gz kernel_samsung_smdk4412-6dd44a74469c203c5106ada2082c46267b4ac674.tar.bz2 | |
BUG_ON() Conversion in drivers/isdn
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/isdn/i4l')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index b9fed8a..a0927d1 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -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 |