The patch titled
More !tty cleanups in drivers/char
has been added to the -mm tree. Its filename is
more-tty-cleanups-in-drivers-char.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: More !tty cleanups in drivers/char
From: Eric Sesterhenn <snakebyte@xxxxxx>
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@xxxxxx>
Cc: Paul Fulghum <paulkf@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/isicom.c | 4 ++--
drivers/char/pcmcia/synclink_cs.c | 4 ++--
drivers/char/specialix.c | 4 ++--
drivers/char/synclink_gt.c | 4 ++--
drivers/char/synclinkmp.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff -puN drivers/char/isicom.c~more-tty-cleanups-in-drivers-char drivers/char/isicom.c
--- a/drivers/char/isicom.c~more-tty-cleanups-in-drivers-char
+++ a/drivers/char/isicom.c
@@ -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);
diff -puN drivers/char/pcmcia/synclink_cs.c~more-tty-cleanups-in-drivers-char drivers/char/pcmcia/synclink_cs.c
--- a/drivers/char/pcmcia/synclink_cs.c~more-tty-cleanups-in-drivers-char
+++ a/drivers/char/pcmcia/synclink_cs.c
@@ -1575,7 +1575,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);
@@ -1642,7 +1642,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) {
diff -puN drivers/char/specialix.c~more-tty-cleanups-in-drivers-char drivers/char/specialix.c
--- a/drivers/char/specialix.c~more-tty-cleanups-in-drivers-char
+++ a/drivers/char/specialix.c
@@ -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;
}
diff -puN drivers/char/synclink_gt.c~more-tty-cleanups-in-drivers-char drivers/char/synclink_gt.c
--- a/drivers/char/synclink_gt.c~more-tty-cleanups-in-drivers-char
+++ a/drivers/char/synclink_gt.c
@@ -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))
diff -puN drivers/char/synclinkmp.c~more-tty-cleanups-in-drivers-char drivers/char/synclinkmp.c
--- a/drivers/char/synclinkmp.c~more-tty-cleanups-in-drivers-char
+++ a/drivers/char/synclinkmp.c
@@ -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);
_
Patches currently in -mm which might be from snakebyte@xxxxxx are
git-alsa.patch
git-dvb.patch
git-gfs2.patch
more-bug_on-conversion.patch
cyclades-cleanup.patch
cyclades-cleanup-cleanup.patch
cleanup-char-espc.patch
more-tty-cleanups-in-drivers-char.patch
fix-typo-in-drivers-isdn-hisax-q931c.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
