summaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-04-09 20:06:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-30 12:26:55 -0400
commit18900ca65a8553edc608b6c9d518eb31e6c09ba1 (patch)
tree6712f933f9145ce4ad365388817266c0c9ebac68 /drivers/isdn
parent1aabf523a288b09d660992c22e307110c70f746d (diff)
tty: Replace TTY_IO_ERROR bit tests with tty_io_error()
Abstract TTY_IO_ERROR status test treewide with tty_io_error(). NB: tty->flags uses atomic bit ops; replace non-atomic bit test with test_bit(). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/i4l/isdn_tty.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 947d5c978b8f..f1edc0814120 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1351,7 +1351,7 @@ isdn_tty_tiocmget(struct tty_struct *tty)
1351 1351
1352 if (isdn_tty_paranoia_check(info, tty->name, __func__)) 1352 if (isdn_tty_paranoia_check(info, tty->name, __func__))
1353 return -ENODEV; 1353 return -ENODEV;
1354 if (tty->flags & (1 << TTY_IO_ERROR)) 1354 if (tty_io_error(tty))
1355 return -EIO; 1355 return -EIO;
1356 1356
1357 mutex_lock(&modem_info_mutex); 1357 mutex_lock(&modem_info_mutex);
@@ -1378,7 +1378,7 @@ isdn_tty_tiocmset(struct tty_struct *tty,
1378 1378
1379 if (isdn_tty_paranoia_check(info, tty->name, __func__)) 1379 if (isdn_tty_paranoia_check(info, tty->name, __func__))
1380 return -ENODEV; 1380 return -ENODEV;
1381 if (tty->flags & (1 << TTY_IO_ERROR)) 1381 if (tty_io_error(tty))
1382 return -EIO; 1382 return -EIO;
1383 1383
1384#ifdef ISDN_DEBUG_MODEM_IOCTL 1384#ifdef ISDN_DEBUG_MODEM_IOCTL
@@ -1419,7 +1419,7 @@ isdn_tty_ioctl(struct tty_struct *tty, uint cmd, ulong arg)
1419 1419
1420 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_ioctl")) 1420 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_ioctl"))
1421 return -ENODEV; 1421 return -ENODEV;
1422 if (tty->flags & (1 << TTY_IO_ERROR)) 1422 if (tty_io_error(tty))
1423 return -EIO; 1423 return -EIO;
1424 switch (cmd) { 1424 switch (cmd) {
1425 case TCSBRK: /* SVID version: non-zero arg --> no break */ 1425 case TCSBRK: /* SVID version: non-zero arg --> no break */