Commit 56ee4827 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

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: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 373ebfbf

drivers/char/epca.c

+1 −2
Original line number Diff line number Diff line
@@ -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.

drivers/char/tty_io.c

+4 −7
Original line number Diff line number Diff line
@@ -543,13 +543,11 @@ 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();

	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)