3 files changed, 6 insertions, 10 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/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c
index b2e0928e8428..093fdf98b19a 100644
--- a/drivers/char/ftape/lowlevel/fdc-io.c
+++ b/drivers/char/ftape/lowlevel/fdc-io.c
@@ -607,7 +607,7 @@ void fdc_reset(void)
 
         fdc_mode = fdc_idle;
 
-        /*  maybe the cli()/sti() pair is not necessary, BUT:
+        /*  maybe the spin_lock_irq* pair is not necessary, BUT:
          *  the following line MUST be here. Otherwise fdc_interrupt_wait()
          *  won't wait. Note that fdc_reset() is called from 
          *  ftape_dumb_stop() when the fdc is busy transferring data. In this
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)