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

Groups > linux.kernel > #1265155

[PATCH 10/14] tty: Remove unset_locked_termios() error message

Show all headers | View raw

With the refactor of 'locked' from parameter to local,
it's now obvious locked cannot be NULL. Remove entire conditional.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/tty/tty_ioctl.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 40d91a3..4957e4c 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -247,11 +247,6 @@ static void unset_locked_termios(struct tty_struct *tty, struct ktermios *old)
 
 #define NOSET_MASK(x, y, z) (x = ((x) & ~(z)) | ((y) & (z)))
 
-	if (!locked) {
-		printk(KERN_WARNING "Warning?!? termios_locked is NULL.\n");
-		return;
-	}
-
 	NOSET_MASK(termios->c_iflag, old->c_iflag, locked->c_iflag);
 	NOSET_MASK(termios->c_oflag, old->c_oflag, locked->c_oflag);
 	NOSET_MASK(termios->c_cflag, old->c_cflag, locked->c_cflag);
-- 
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