[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151209203248.16771.25053.stgit@localhost.localdomain>
Date: Wed, 09 Dec 2015 20:33:24 +0000
From: Alan Cox <alan@...ux.intel.com>
To: tilman@...p.cc, linux-kernel@...r.kernel.org
Subject: [PATCH] gigaset: turn nonsense checks into WARN_ON
These checks do nothing useful to protect the code from races. On the other
hand if the old code has been masking a real bug we would like to know about
it.
The check for tiocmset is kept because it is valid for a tty driver to have
a NULL tiocmset method. That in itself is probably a mistake given modern
coding practices - but needs fixing in the tty layer.
Signed-off-by: Alan Cox <alan@...ux.intel.com>
---
drivers/isdn/gigaset/ser-gigaset.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index d8771b5..8e21f6af 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -67,8 +67,7 @@ static int write_modem(struct cardstate *cs)
struct sk_buff *skb = bcs->tx_skb;
int sent = -EOPNOTSUPP;
- if (!tty || !tty->ops || !skb)
- return -EINVAL;
+ WARN_ON(!tty || !tty->ops || !skb);
if (!skb->len) {
dev_kfree_skb_any(skb);
@@ -109,8 +108,7 @@ static int send_cb(struct cardstate *cs)
unsigned long flags;
int sent = 0;
- if (!tty || !tty->ops)
- return -EFAULT;
+ WARN_ON(!tty || !tty->ops);
cb = cs->cmdbuf;
if (!cb)
@@ -432,7 +430,9 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
struct tty_struct *tty = cs->hw.ser->tty;
unsigned int set, clear;
- if (!tty || !tty->ops || !tty->ops->tiocmset)
+ WARN_ON(!tty || !tty->ops);
+ /* tiocmset is an optional tty driver method */
+ if (!tty->ops->tiocmset)
return -EINVAL;
set = new_state & ~old_state;
clear = old_state & ~new_state;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists