Skip to content

Commit

Permalink
tty: Deletion of unnecessary checks before two function calls
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Markus Elfring authored and Greg Kroah-Hartman committed Nov 27, 2014
1 parent 8bfbe2d commit a211b1a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 2 additions & 4 deletions drivers/tty/tty_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,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);
Expand Down Expand Up @@ -1688,8 +1687,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);
}

Expand Down
3 changes: 1 addition & 2 deletions drivers/tty/tty_port.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit a211b1a

Please sign in to comment.