lkml.org 
[lkml]   [2012]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] TTY: pty, remove superfluous ptm test
    Date
    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>
    ---
    drivers/tty/pty.c | 5 +----
    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();
    --
    1.7.8.3



    \
     
     \ /
      Last update: 2012-01-30 21:23    [W:0.022 / U:0.624 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site