summaryrefslogtreecommitdiffstats
path: root/drivers/tty/pty.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-01-30 21:14:31 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-02 15:10:46 -0800
commita50f724a432997321cabb6c9e665c28e34850f78 (patch)
tree19e42720b0bb67bb513a2b81364d97cb66498620 /drivers/tty/pty.c
parent81f5835eae424be646753ec5a044ed4db1fcc09a (diff)
downloadop-kernel-dev-a50f724a432997321cabb6c9e665c28e34850f78.zip
op-kernel-dev-a50f724a432997321cabb6c9e665c28e34850f78.tar.gz
TTY: pty, remove superfluous ptm test
The code looks like: if (tty->driver->subtype == PTY_TYPE_MASTER) { ... if (tty->driver == ptm_driver) But the second if is superfluous because only the ptm_driver is of PTY_TYPE_MASTER subtype. Also we can remove the #if now because devpts_pty_kill is defined as an empty function for non-CONFIG_UNIX98_PTYS configs. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/pty.c')
-rw-r--r--drivers/tty/pty.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index d505837..ddec9f3 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -54,10 +54,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
wake_up_interruptible(&tty->link->write_wait);
if (tty->driver->subtype == PTY_TYPE_MASTER) {
set_bit(TTY_OTHER_CLOSED, &tty->flags);
-#ifdef CONFIG_UNIX98_PTYS
- if (tty->driver == ptm_driver)
- devpts_pty_kill(tty->link);
-#endif
+ devpts_pty_kill(tty->link);
tty_unlock();
tty_vhangup(tty->link);
tty_lock();
OpenPOWER on IntegriCloud