summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-21 13:42:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-26 19:35:49 -0800
commita211b1af1933a3b6019d985762f5237d1d4c4213 (patch)
tree7783a3eaf3c3550754f95e5b9019995cb77838ca /drivers/tty
parent8bfbe2de769afda051c56aba5450391670e769fc (diff)
downloadlinux-a211b1af1933a3b6019d985762f5237d1d4c4213.tar.gz
linux-a211b1af1933a3b6019d985762f5237d1d4c4213.tar.bz2
linux-a211b1af1933a3b6019d985762f5237d1d4c4213.zip
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: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/tty_io.c6
-rw-r--r--drivers/tty/tty_port.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 705885891b87..4f35b43e2475 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -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);
@@ -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);
}
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 4d9abaa81be4..40b31835f80b 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);
}