TTY: pty, remove superfluous ptm test
Jiri Slaby [Mon, 30 Jan 2012 20:14:31 +0000 (21:14 +0100)]
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>

drivers/tty/pty.c

index d505837..ddec9f3 100644 (file)
@@ -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();