Commit a211b1af authored by Markus Elfring's avatar Markus Elfring Committed by Greg Kroah-Hartman

tty: Deletion of unnecessary checks before two function calls

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8bfbe2de
...@@ -167,8 +167,7 @@ void free_tty_struct(struct tty_struct *tty) ...@@ -167,8 +167,7 @@ void free_tty_struct(struct tty_struct *tty)
{ {
if (!tty) if (!tty)
return; return;
if (tty->dev) put_device(tty->dev);
put_device(tty->dev);
kfree(tty->write_buf); kfree(tty->write_buf);
tty->magic = 0xDEADDEAD; tty->magic = 0xDEADDEAD;
kfree(tty); kfree(tty);
...@@ -1688,8 +1687,7 @@ static void release_tty(struct tty_struct *tty, int idx) ...@@ -1688,8 +1687,7 @@ static void release_tty(struct tty_struct *tty, int idx)
tty->link->port->itty = NULL; tty->link->port->itty = NULL;
cancel_work_sync(&tty->port->buf.work); cancel_work_sync(&tty->port->buf.work);
if (tty->link) tty_kref_put(tty->link);
tty_kref_put(tty->link);
tty_kref_put(tty); tty_kref_put(tty);
} }
......
...@@ -193,8 +193,7 @@ void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty) ...@@ -193,8 +193,7 @@ void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&port->lock, 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); port->tty = tty_kref_get(tty);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment