Commit 6d029c68 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Merge conditional + error message + WARN_ON() 



WARN() does all of these things in one statement.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d435cefe

drivers/tty/tty_mutex.c

+2 −8
Original line number Diff line number Diff line
@@ -12,11 +12,8 @@ 


void __lockfunc tty_lock(struct tty_struct *tty)

{

	if (tty->magic != TTY_MAGIC) {

		pr_err("L Bad %p\n", tty);

		WARN_ON(1);

	if (WARN(tty->magic != TTY_MAGIC, "L Bad %p\n", tty))

		return;

	}

	tty_kref_get(tty);

	mutex_lock(&tty->legacy_mutex);

}
@@ -24,11 +21,8 @@ EXPORT_SYMBOL(tty_lock); 


void __lockfunc tty_unlock(struct tty_struct *tty)

{

	if (tty->magic != TTY_MAGIC) {

		pr_err("U Bad %p\n", tty);

		WARN_ON(1);

	if (WARN(tty->magic != TTY_MAGIC, "U Bad %p\n", tty))

		return;

	}

	mutex_unlock(&tty->legacy_mutex);

	tty_kref_put(tty);

}