Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

tty: Merge conditional + error message + WARN_ON()

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

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2015-11-08 13:01:20 -05:00 committed by Greg Kroah-Hartman
parent d435cefe9c
commit 6d029c68de
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/tty_mutex.c
View File

@ -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);
}