Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1265159

[PATCH 13/14] tty: Merge conditional + error message + WARN_ON()

Show all headers | View raw

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

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/tty/tty_mutex.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index 0efcf71..77703a3 100644
--- 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);
 }
-- 
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/14] tty core printk cleanup Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 06/14] tty: Define tty_*() printk macros Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 03/14] tty: synclink_gt: Rename tty_driver_name Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 01/14] tty: Improve tty_debug() macro Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
    Re: [PATCH 01/14] tty: Improve tty_debug() macro Joe Perches <joe@perches.com> - 2015-11-08 20:00 +0100
      Re: [PATCH 01/14] tty: Improve tty_debug() macro Joe Perches <joe@perches.com> - 2015-11-08 20:40 +0100
      Re: [PATCH 01/14] tty: Improve tty_debug() macro Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 20:40 +0100
  [PATCH 12/14] tty: Remove __func__ from tty_debug() macro Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 10/14] tty: Remove unset_locked_termios() error message Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 05/14] tty: core: Add helper fn to deref tty driver name Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 14/14] tty: core: Prefer dev_dbg() over pr_debug() Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 08/14] tty: core: Add driver name to invalid device registration message Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 13/14] tty: Merge conditional + error message + WARN_ON() Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 09/14] tty: core: Refactor parameters for unset_locked_termios() helper Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 11/14] tty: core: Prefer pr_* to printk(*) Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100

csiph-web