lkml.org 
[lkml]   [2014]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] tty: Deletion of unnecessary checks before two function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 21 Nov 2014 13:42:29 +0100

    The functions put_device() and tty_kref_put() test whether their argument
    is NULL and then return immediately.
    Thus the test around the call is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/tty/tty_io.c | 6 ++----
    drivers/tty/tty_port.c | 3 +--
    2 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
    index 848c17a..3302789 100644
    --- a/drivers/tty/tty_io.c
    +++ b/drivers/tty/tty_io.c
    @@ -169,8 +169,7 @@ void free_tty_struct(struct tty_struct *tty)
    {
    if (!tty)
    return;
    - if (tty->dev)
    - put_device(tty->dev);
    + put_device(tty->dev);
    kfree(tty->write_buf);
    tty->magic = 0xDEADDEAD;
    kfree(tty);
    @@ -1612,8 +1611,7 @@ static void release_tty(struct tty_struct *tty, int idx)
    tty->link->port->itty = NULL;
    cancel_work_sync(&tty->port->buf.work);

    - if (tty->link)
    - tty_kref_put(tty->link);
    + tty_kref_put(tty->link);
    tty_kref_put(tty);
    }

    diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
    index 1b93357..856c064 100644
    --- a/drivers/tty/tty_port.c
    +++ b/drivers/tty/tty_port.c
    @@ -193,8 +193,7 @@ void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
    unsigned long flags;

    spin_lock_irqsave(&port->lock, flags);
    - if (port->tty)
    - tty_kref_put(port->tty);
    + tty_kref_put(port->tty);
    port->tty = tty_kref_get(tty);
    spin_unlock_irqrestore(&port->lock, flags);
    }
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-21 14:21    [W:4.020 / U:34.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site