tty: Merge conditional + error message + WARN_ON()

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>

diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index 0efcf713b756e5e7eaf95bf7b5f2a744fc7f6dc0..77703a3912075a7b740eb4626a5159d55ea6f57a 100644 (file)
--- a/drivers/tty/tty_mutex.c
+++ b/drivers/tty/tty_mutex.c
@@ -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);
 }