From: Eric Sesterhenn <snakebyte@gmx.de>
To: linux-kernel@vger.kernel.org
Subject: [Patch] More !tty cleanups in drivers/char
Date: Mon, 12 Jun 2006 12:02:22 +0200 [thread overview]
Message-ID: <1150106542.10437.3.camel@alice> (raw)
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 <snakebyte@gmx.de>
--- 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);
reply other threads:[~2006-06-12 10:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1150106542.10437.3.camel@alice \
--to=snakebyte@gmx.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.