diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-26 18:17:21 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-03-26 18:17:21 +0200 |
| commit | 56ee48277fa214b3b7b0fd91e7fd3464e12597de (patch) | |
| tree | 58068d7f6ccf295aa8dc10a131e34fc9fe3c3528 /drivers | |
| parent | 373ebfbf17a8ecad304f65cb92c4d2d10adc0a19 (diff) | |
| download | blackbird-op-linux-56ee48277fa214b3b7b0fd91e7fd3464e12597de.tar.gz blackbird-op-linux-56ee48277fa214b3b7b0fd91e7fd3464e12597de.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/epca.c | 3 | ||||
| -rw-r--r-- | drivers/char/tty_io.c | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index 765c5c108bf4..9cad8501d62c 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c @@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp) } /* End channel is open more than once */ /* Port open only once go ahead with shutdown & reset */ - if (ch->count < 0) - BUG(); + BUG_ON(ch->count < 0); /* --------------------------------------------------------------- Let the rest of the driver know the channel is being closed. diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 48d795bb8c4b..811dadb9ce3e 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -543,14 +543,12 @@ void tty_ldisc_put(int disc) struct tty_ldisc *ld; unsigned long flags; - if (disc < N_TTY || disc >= NR_LDISCS) - BUG(); + BUG_ON(disc < N_TTY || disc >= NR_LDISCS); spin_lock_irqsave(&tty_ldisc_lock, flags); ld = &tty_ldiscs[disc]; - if(ld->refcount == 0) - BUG(); - ld->refcount --; + BUG_ON(ld->refcount == 0); + ld->refcount--; module_put(ld->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } @@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld) { unsigned long flags; - if(ld == NULL) - BUG(); + BUG_ON(ld == NULL); spin_lock_irqsave(&tty_ldisc_lock, flags); if(ld->refcount == 0) |
