BUG_ON() Conversion in drivers/char

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:17:21 +02:00 committed by Adrian Bunk
parent 373ebfbf17
commit 56ee48277f
2 changed files with 5 additions and 9 deletions

View file

@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp)
} /* End channel is open more than once */ } /* End channel is open more than once */
/* Port open only once go ahead with shutdown & reset */ /* Port open only once go ahead with shutdown & reset */
if (ch->count < 0) BUG_ON(ch->count < 0);
BUG();
/* --------------------------------------------------------------- /* ---------------------------------------------------------------
Let the rest of the driver know the channel is being closed. Let the rest of the driver know the channel is being closed.

View file

@ -543,14 +543,12 @@ void tty_ldisc_put(int disc)
struct tty_ldisc *ld; struct tty_ldisc *ld;
unsigned long flags; unsigned long flags;
if (disc < N_TTY || disc >= NR_LDISCS) BUG_ON(disc < N_TTY || disc >= NR_LDISCS);
BUG();
spin_lock_irqsave(&tty_ldisc_lock, flags); spin_lock_irqsave(&tty_ldisc_lock, flags);
ld = &tty_ldiscs[disc]; ld = &tty_ldiscs[disc];
if(ld->refcount == 0) BUG_ON(ld->refcount == 0);
BUG(); ld->refcount--;
ld->refcount --;
module_put(ld->owner); module_put(ld->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags); spin_unlock_irqrestore(&tty_ldisc_lock, flags);
} }
@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld)
{ {
unsigned long flags; unsigned long flags;
if(ld == NULL) BUG_ON(ld == NULL);
BUG();
spin_lock_irqsave(&tty_ldisc_lock, flags); spin_lock_irqsave(&tty_ldisc_lock, flags);
if(ld->refcount == 0) if(ld->refcount == 0)