Re: [PATCH] tty: Replace TTY_THROTTLED bit tests with tty_throttled()

[Johan Hovold]

On Sat, Apr 09, 2016 at 05:11:36PM -0700, Peter Hurley wrote:
> Abstract TTY_THROTTLED bit tests with tty_throttled().
> 
> Signed-off-by: Peter Hurley 
> ---
>  drivers/char/pcmcia/synclink_cs.c  | 2 +-
>  drivers/mmc/card/sdio_uart.c   | 2 +-
>  drivers/net/usb/hso.c  | 2 +-
>  drivers/staging/fwserial/fwserial.c| 2 +-
>  drivers/staging/speakup/selection.c| 2 +-
>  drivers/tty/amiserial.c| 2 +-
>  drivers/tty/hvc/hvc_console.c  | 2 +-
>  drivers/tty/hvc/hvcs.c | 2 +-
>  drivers/tty/hvc/hvsi.c | 2 +-
>  drivers/tty/moxa.c | 2 +-
>  drivers/tty/nozomi.c   | 2 +-
>  drivers/tty/serial/serial_core.c   | 2 +-
>  drivers/tty/synclink.c | 2 +-
>  drivers/tty/synclink_gt.c  | 2 +-
>  drivers/tty/synclinkmp.c   | 2 +-
>  drivers/tty/tty_ioctl.c| 4 ++--
>  drivers/tty/vt/selection.c | 2 +-
>  drivers/usb/gadget/function/u_serial.c | 4 ++--
>  drivers/usb/serial/digi_acceleport.c   | 3 +--

For usb-serial

Acked-by: Johan Hovold 

Thanks,
Johan

Re: [PATCH] tty: Replace TTY_THROTTLED bit tests with tty_throttled()

[Johan Hovold]

On Sat, Apr 09, 2016 at 05:11:36PM -0700, Peter Hurley wrote:
> Abstract TTY_THROTTLED bit tests with tty_throttled().
> 
> Signed-off-by: Peter Hurley 
> ---
>  drivers/char/pcmcia/synclink_cs.c  | 2 +-
>  drivers/mmc/card/sdio_uart.c   | 2 +-
>  drivers/net/usb/hso.c  | 2 +-
>  drivers/staging/fwserial/fwserial.c| 2 +-
>  drivers/staging/speakup/selection.c| 2 +-
>  drivers/tty/amiserial.c| 2 +-
>  drivers/tty/hvc/hvc_console.c  | 2 +-
>  drivers/tty/hvc/hvcs.c | 2 +-
>  drivers/tty/hvc/hvsi.c | 2 +-
>  drivers/tty/moxa.c | 2 +-
>  drivers/tty/nozomi.c   | 2 +-
>  drivers/tty/serial/serial_core.c   | 2 +-
>  drivers/tty/synclink.c | 2 +-
>  drivers/tty/synclink_gt.c  | 2 +-
>  drivers/tty/synclinkmp.c   | 2 +-
>  drivers/tty/tty_ioctl.c| 4 ++--
>  drivers/tty/vt/selection.c | 2 +-
>  drivers/usb/gadget/function/u_serial.c | 4 ++--
>  drivers/usb/serial/digi_acceleport.c   | 3 +--

For usb-serial

Acked-by: Johan Hovold 

Thanks,
Johan

[PATCH] tty: Replace TTY_THROTTLED bit tests with tty_throttled()

[Peter Hurley]

Abstract TTY_THROTTLED bit tests with tty_throttled().

Signed-off-by: Peter Hurley 
---
 drivers/char/pcmcia/synclink_cs.c  | 2 +-
 drivers/mmc/card/sdio_uart.c   | 2 +-
 drivers/net/usb/hso.c  | 2 +-
 drivers/staging/fwserial/fwserial.c| 2 +-
 drivers/staging/speakup/selection.c| 2 +-
 drivers/tty/amiserial.c| 2 +-
 drivers/tty/hvc/hvc_console.c  | 2 +-
 drivers/tty/hvc/hvcs.c | 2 +-
 drivers/tty/hvc/hvsi.c | 2 +-
 drivers/tty/moxa.c | 2 +-
 drivers/tty/nozomi.c   | 2 +-
 drivers/tty/serial/serial_core.c   | 2 +-
 drivers/tty/synclink.c | 2 +-
 drivers/tty/synclink_gt.c  | 2 +-
 drivers/tty/synclinkmp.c   | 2 +-
 drivers/tty/tty_ioctl.c| 4 ++--
 drivers/tty/vt/selection.c | 2 +-
 drivers/usb/gadget/function/u_serial.c | 4 ++--
 drivers/usb/serial/digi_acceleport.c   | 3 +--
 include/linux/tty.h| 5 +
 net/irda/ircomm/ircomm_tty_ioctl.c | 2 +-
 21 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/drivers/char/pcmcia/synclink_cs.c 
b/drivers/char/pcmcia/synclink_cs.c
index 825db42..bcae5bb 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2316,7 +2316,7 @@ static void mgslpc_set_termios(struct tty_struct *tty, 
struct ktermios *old_term
/* Handle transition away from B0 status */
if (!(old_termios->c_cflag & CBAUD) && C_BAUD(tty)) {
info->serial_signals |= SerialSignal_DTR;
-   if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, >flags))
+   if (!C_CRTSCTS(tty) || !tty_throttled(tty))
info->serial_signals |= SerialSignal_RTS;
spin_lock_irqsave(>lock, flags);
set_signals(info);
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 5415056..5af6fb9 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -895,7 +895,7 @@ static void sdio_uart_set_termios(struct tty_struct *tty,
/* Handle transition away from B0 status */
if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
unsigned int mask = TIOCM_DTR;
-   if (!(cflag & CRTSCTS) || !test_bit(TTY_THROTTLED, >flags))
+   if (!(cflag & CRTSCTS) || !tty_throttled(tty))
mask |= TIOCM_RTS;
sdio_uart_set_mctrl(port, mask);
}
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 111d907..4b44586 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2029,7 +2029,7 @@ static int put_rxbuf_data(struct urb *urb, struct 
hso_serial *serial)
 
tty = tty_port_tty_get(>port);
 
-   if (tty && test_bit(TTY_THROTTLED, >flags)) {
+   if (tty && tty_throttled(tty)) {
tty_kref_put(tty);
return -1;
}
diff --git a/drivers/staging/fwserial/fwserial.c 
b/drivers/staging/fwserial/fwserial.c
index 9b23b5c..1f9389d 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -1305,7 +1305,7 @@ static void fwtty_set_termios(struct tty_struct *tty, 
struct ktermios *old)
if ((baud == 0) && (old->c_cflag & CBAUD)) {
port->mctrl &= ~(TIOCM_DTR | TIOCM_RTS);
} else if ((baud != 0) && !(old->c_cflag & CBAUD)) {
-   if (C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, >flags))
+   if (C_CRTSCTS(tty) || !tty_throttled(tty))
port->mctrl |= TIOCM_DTR | TIOCM_RTS;
else
port->mctrl |= TIOCM_DTR;
diff --git a/drivers/staging/speakup/selection.c 
b/drivers/staging/speakup/selection.c
index 41ef099..0149edc 100644
--- a/drivers/staging/speakup/selection.c
+++ b/drivers/staging/speakup/selection.c
@@ -150,7 +150,7 @@ static void __speakup_paste_selection(struct work_struct 
*work)
add_wait_queue(>paste_wait, );
while (sel_buffer && sel_buffer_lth > pasted) {
set_current_state(TASK_INTERRUPTIBLE);
-   if (test_bit(TTY_THROTTLED, >flags)) {
+   if (tty_throttled(tty)) {
schedule();
continue;
}
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 183e98e..e68208e 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1342,7 +1342,7 @@ static void rs_set_termios(struct tty_struct *tty, struct 
ktermios *old_termios)
/* Handle transition away from B0 status */
if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
info->MCR |= SER_DTR;
-   if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, >flags))
+   if (!C_CRTSCTS(tty) || !tty_throttled(tty))
info->MCR |= SER_RTS;

[PATCH] tty: Replace TTY_THROTTLED bit tests with tty_throttled()

[Peter Hurley]

Abstract TTY_THROTTLED bit tests with tty_throttled().

Signed-off-by: Peter Hurley 
---
 drivers/char/pcmcia/synclink_cs.c  | 2 +-
 drivers/mmc/card/sdio_uart.c   | 2 +-
 drivers/net/usb/hso.c  | 2 +-
 drivers/staging/fwserial/fwserial.c| 2 +-
 drivers/staging/speakup/selection.c| 2 +-
 drivers/tty/amiserial.c| 2 +-
 drivers/tty/hvc/hvc_console.c  | 2 +-
 drivers/tty/hvc/hvcs.c | 2 +-
 drivers/tty/hvc/hvsi.c | 2 +-
 drivers/tty/moxa.c | 2 +-
 drivers/tty/nozomi.c   | 2 +-
 drivers/tty/serial/serial_core.c   | 2 +-
 drivers/tty/synclink.c | 2 +-
 drivers/tty/synclink_gt.c  | 2 +-
 drivers/tty/synclinkmp.c   | 2 +-
 drivers/tty/tty_ioctl.c| 4 ++--
 drivers/tty/vt/selection.c | 2 +-
 drivers/usb/gadget/function/u_serial.c | 4 ++--
 drivers/usb/serial/digi_acceleport.c   | 3 +--
 include/linux/tty.h| 5 +
 net/irda/ircomm/ircomm_tty_ioctl.c | 2 +-
 21 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/drivers/char/pcmcia/synclink_cs.c 
b/drivers/char/pcmcia/synclink_cs.c
index 825db42..bcae5bb 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2316,7 +2316,7 @@ static void mgslpc_set_termios(struct tty_struct *tty, 
struct ktermios *old_term
/* Handle transition away from B0 status */
if (!(old_termios->c_cflag & CBAUD) && C_BAUD(tty)) {
info->serial_signals |= SerialSignal_DTR;
-   if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, >flags))
+   if (!C_CRTSCTS(tty) || !tty_throttled(tty))
info->serial_signals |= SerialSignal_RTS;
spin_lock_irqsave(>lock, flags);
set_signals(info);
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 5415056..5af6fb9 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -895,7 +895,7 @@ static void sdio_uart_set_termios(struct tty_struct *tty,
/* Handle transition away from B0 status */
if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
unsigned int mask = TIOCM_DTR;
-   if (!(cflag & CRTSCTS) || !test_bit(TTY_THROTTLED, >flags))
+   if (!(cflag & CRTSCTS) || !tty_throttled(tty))
mask |= TIOCM_RTS;
sdio_uart_set_mctrl(port, mask);
}
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 111d907..4b44586 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2029,7 +2029,7 @@ static int put_rxbuf_data(struct urb *urb, struct 
hso_serial *serial)
 
tty = tty_port_tty_get(>port);
 
-   if (tty && test_bit(TTY_THROTTLED, >flags)) {
+   if (tty && tty_throttled(tty)) {
tty_kref_put(tty);
return -1;
}
diff --git a/drivers/staging/fwserial/fwserial.c 
b/drivers/staging/fwserial/fwserial.c
index 9b23b5c..1f9389d 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -1305,7 +1305,7 @@ static void fwtty_set_termios(struct tty_struct *tty, 
struct ktermios *old)
if ((baud == 0) && (old->c_cflag & CBAUD)) {
port->mctrl &= ~(TIOCM_DTR | TIOCM_RTS);
} else if ((baud != 0) && !(old->c_cflag & CBAUD)) {
-   if (C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, >flags))
+   if (C_CRTSCTS(tty) || !tty_throttled(tty))
port->mctrl |= TIOCM_DTR | TIOCM_RTS;
else
port->mctrl |= TIOCM_DTR;
diff --git a/drivers/staging/speakup/selection.c 
b/drivers/staging/speakup/selection.c
index 41ef099..0149edc 100644
--- a/drivers/staging/speakup/selection.c
+++ b/drivers/staging/speakup/selection.c
@@ -150,7 +150,7 @@ static void __speakup_paste_selection(struct work_struct 
*work)
add_wait_queue(>paste_wait, );
while (sel_buffer && sel_buffer_lth > pasted) {
set_current_state(TASK_INTERRUPTIBLE);
-   if (test_bit(TTY_THROTTLED, >flags)) {
+   if (tty_throttled(tty)) {
schedule();
continue;
}
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 183e98e..e68208e 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1342,7 +1342,7 @@ static void rs_set_termios(struct tty_struct *tty, struct 
ktermios *old_termios)
/* Handle transition away from B0 status */
if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
info->MCR |= SER_DTR;
-   if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, >flags))
+   if (!C_CRTSCTS(tty) || !tty_throttled(tty))
info->MCR |= SER_RTS;
local_irq_save(flags);