hi,
another bunch of checks in the char drivers .put_char() and
.write() routines, where tty can never be NULL. This patch removes
these checks to save some code. Coverity choked at those with the
following bug ids:
isicom.c 767, 766
specialix.c 773, 774
synclink_cs.c 779, 781
synclink_gt.c 784, 785
synclinkmp.c 784, 785
Signed-off-by: Eric Sesterhenn <[email protected]>
--- linux-2.6.17-rc5/drivers/char/isicom.c.orig 2006-06-12 11:48:16.000000000 +0200
+++ linux-2.6.17-rc5/drivers/char/isicom.c 2006-06-12 11:49:23.000000000 +0200
@@ -1145,7 +1145,7 @@ static int isicom_write(struct tty_struc
if (isicom_paranoia_check(port, tty->name, "isicom_write"))
return 0;
- if (!tty || !port->xmit_buf)
+ if (!port->xmit_buf)
return 0;
spin_lock_irqsave(&card->card_lock, flags);
@@ -1180,7 +1180,7 @@ static void isicom_put_char(struct tty_s
if (isicom_paranoia_check(port, tty->name, "isicom_put_char"))
return;
- if (!tty || !port->xmit_buf)
+ if (!port->xmit_buf)
return;
spin_lock_irqsave(&card->card_lock, flags);
--- linux-2.6.17-rc5/drivers/char/specialix.c.orig 2006-06-12 11:50:53.000000000 +0200
+++ linux-2.6.17-rc5/drivers/char/specialix.c 2006-06-12 11:51:40.000000000 +0200
@@ -1683,7 +1683,7 @@ static int sx_write(struct tty_struct *
bp = port_Board(port);
- if (!tty || !port->xmit_buf || !tmp_buf) {
+ if (!port->xmit_buf || !tmp_buf) {
func_exit();
return 0;
}
@@ -1733,7 +1733,7 @@ static void sx_put_char(struct tty_struc
return;
}
dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf);
- if (!tty || !port->xmit_buf) {
+ if (!port->xmit_buf) {
func_exit();
return;
}
--- linux-2.6.17-rc5/drivers/char/pcmcia/synclink_cs.c.orig 2006-06-12 11:52:31.000000000 +0200
+++ linux-2.6.17-rc5/drivers/char/pcmcia/synclink_cs.c 2006-06-12 11:53:33.000000000 +0200
@@ -1582,7 +1582,7 @@ static void mgslpc_put_char(struct tty_s
if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char"))
return;
- if (!tty || !info->tx_buf)
+ if (!info->tx_buf)
return;
spin_lock_irqsave(&info->lock,flags);
@@ -1649,7 +1649,7 @@ static int mgslpc_write(struct tty_struc
__FILE__,__LINE__,info->device_name,count);
if (mgslpc_paranoia_check(info, tty->name, "mgslpc_write") ||
- !tty || !info->tx_buf)
+ !info->tx_buf)
goto cleanup;
if (info->params.mode == MGSL_MODE_HDLC) {
--- linux-2.6.17-rc5/drivers/char/synclink_gt.c.orig 2006-06-12 11:54:39.000000000 +0200
+++ linux-2.6.17-rc5/drivers/char/synclink_gt.c 2006-06-12 11:55:14.000000000 +0200
@@ -870,7 +870,7 @@ static int write(struct tty_struct *tty,
goto cleanup;
DBGINFO(("%s write count=%d\n", info->device_name, count));
- if (!tty || !info->tx_buf)
+ if (!info->tx_buf)
goto cleanup;
if (count > info->max_frame_size) {
@@ -924,7 +924,7 @@ static void put_char(struct tty_struct *
if (sanity_check(info, tty->name, "put_char"))
return;
DBGINFO(("%s put_char(%d)\n", info->device_name, ch));
- if (!tty || !info->tx_buf)
+ if (!info->tx_buf)
return;
spin_lock_irqsave(&info->lock,flags);
if (!info->tx_active && (info->tx_count < info->max_frame_size))
--- linux-2.6.17-rc5/drivers/char/synclinkmp.c.orig 2006-06-12 11:56:12.000000000 +0200
+++ linux-2.6.17-rc5/drivers/char/synclinkmp.c 2006-06-12 11:56:27.000000000 +0200
@@ -988,7 +988,7 @@ static int write(struct tty_struct *tty,
if (sanity_check(info, tty->name, "write"))
goto cleanup;
- if (!tty || !info->tx_buf)
+ if (!info->tx_buf)
goto cleanup;
if (info->params.mode == MGSL_MODE_HDLC) {
@@ -1067,7 +1067,7 @@ static void put_char(struct tty_struct *
if (sanity_check(info, tty->name, "put_char"))
return;
- if (!tty || !info->tx_buf)
+ if (!info->tx_buf)
return;
spin_lock_irqsave(&info->lock,flags);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
