[8/8] tty: Convert hw_stopped in tty_struct to bool
Commit Message
hw_stopped in tty_struct is used like bool, convert the variable type
to bool.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/char/pcmcia/synclink_cs.c | 6 +++---
drivers/mmc/core/sdio_uart.c | 10 +++++-----
drivers/tty/amiserial.c | 6 +++---
drivers/tty/mxser.c | 6 +++---
drivers/tty/synclink_gt.c | 6 +++---
include/linux/tty.h | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
Comments
On Thu, Mar 9, 2023, at 09:20, Ilpo Järvinen wrote:
> hw_stopped in tty_struct is used like bool, convert the variable type
> to bool.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> ---
> drivers/char/pcmcia/synclink_cs.c | 6 +++---
> drivers/mmc/core/sdio_uart.c | 10 +++++-----
> drivers/tty/amiserial.c | 6 +++---
> drivers/tty/mxser.c | 6 +++---
> drivers/tty/synclink_gt.c | 6 +++---
> include/linux/tty.h | 2 +-
> 6 files changed, 18 insertions(+), 18 deletions(-)
The patch looks good to me, but it will (trivially) conflict with the
synclink_cs removal.
Arnd
On Thu, 9 Mar 2023 at 09:22, Ilpo Järvinen
<ilpo.jarvinen@linux.intel.com> wrote:
>
> hw_stopped in tty_struct is used like bool, convert the variable type
> to bool.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Kind regards
Uffe
> ---
> drivers/char/pcmcia/synclink_cs.c | 6 +++---
> drivers/mmc/core/sdio_uart.c | 10 +++++-----
> drivers/tty/amiserial.c | 6 +++---
> drivers/tty/mxser.c | 6 +++---
> drivers/tty/synclink_gt.c | 6 +++---
> include/linux/tty.h | 2 +-
> 6 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
> index 6ddfeb2fe98f..97c5bfb9d58a 100644
> --- a/drivers/char/pcmcia/synclink_cs.c
> +++ b/drivers/char/pcmcia/synclink_cs.c
> @@ -1060,7 +1060,7 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
> if (info->serial_signals & SerialSignal_CTS) {
> if (debug_level >= DEBUG_LEVEL_ISR)
> printk("CTS tx start...");
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> tx_start(info, tty);
> info->pending_bh |= BH_TRANSMIT;
> return;
> @@ -1069,7 +1069,7 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
> if (!(info->serial_signals & SerialSignal_CTS)) {
> if (debug_level >= DEBUG_LEVEL_ISR)
> printk("CTS tx stop...");
> - tty->hw_stopped = 1;
> + tty->hw_stopped = true;
> tx_stop(info);
> }
> }
> @@ -2312,7 +2312,7 @@ static void mgslpc_set_termios(struct tty_struct *tty,
>
> /* Handle turning off CRTSCTS */
> if (old_termios->c_cflag & CRTSCTS && !C_CRTSCTS(tty)) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> tx_release(tty);
> }
> }
> diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c
> index 50536fe59f1a..aa659758563f 100644
> --- a/drivers/mmc/core/sdio_uart.c
> +++ b/drivers/mmc/core/sdio_uart.c
> @@ -478,13 +478,13 @@ static void sdio_uart_check_modem_status(struct sdio_uart_port *port)
> int cts = (status & UART_MSR_CTS);
> if (tty->hw_stopped) {
> if (cts) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> sdio_uart_start_tx(port);
> tty_wakeup(tty);
> }
> } else {
> if (!cts) {
> - tty->hw_stopped = 1;
> + tty->hw_stopped = true;
> sdio_uart_stop_tx(port);
> }
> }
> @@ -633,7 +633,7 @@ static int sdio_uart_activate(struct tty_port *tport, struct tty_struct *tty)
>
> if (C_CRTSCTS(tty))
> if (!(sdio_uart_get_mctrl(port) & TIOCM_CTS))
> - tty->hw_stopped = 1;
> + tty->hw_stopped = true;
>
> clear_bit(TTY_IO_ERROR, &tty->flags);
>
> @@ -882,14 +882,14 @@ static void sdio_uart_set_termios(struct tty_struct *tty,
>
> /* Handle turning off CRTSCTS */
> if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> sdio_uart_start_tx(port);
> }
>
> /* Handle turning on CRTSCTS */
> if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
> if (!(sdio_uart_get_mctrl(port) & TIOCM_CTS)) {
> - tty->hw_stopped = 1;
> + tty->hw_stopped = true;
> sdio_uart_stop_tx(port);
> }
> }
> diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
> index d7515d61659e..c06ad0a0744b 100644
> --- a/drivers/tty/amiserial.c
> +++ b/drivers/tty/amiserial.c
> @@ -347,7 +347,7 @@ static void check_modem_status(struct serial_state *info)
> #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
> printk("CTS tx start...");
> #endif
> - port->tty->hw_stopped = 0;
> + port->tty->hw_stopped = false;
> info->IER |= UART_IER_THRI;
> amiga_custom.intena = IF_SETCLR | IF_TBE;
> mb();
> @@ -362,7 +362,7 @@ static void check_modem_status(struct serial_state *info)
> #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
> printk("CTS tx stop...");
> #endif
> - port->tty->hw_stopped = 1;
> + port->tty->hw_stopped = true;
> info->IER &= ~UART_IER_THRI;
> /* disable Tx interrupt and remove any pending interrupts */
> amiga_custom.intena = IF_TBE;
> @@ -1197,7 +1197,7 @@ static void rs_set_termios(struct tty_struct *tty, const struct ktermios *old_te
>
> /* Handle turning off CRTSCTS */
> if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> rs_start(tty);
> }
>
> diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
> index ef3116e87975..10855e66fda1 100644
> --- a/drivers/tty/mxser.c
> +++ b/drivers/tty/mxser.c
> @@ -553,7 +553,7 @@ static void mxser_handle_cts(struct tty_struct *tty, struct mxser_port *info,
>
> if (tty->hw_stopped) {
> if (cts) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
>
> if (!mxser_16550A_or_MUST(info))
> __mxser_start_tx(info);
> @@ -563,7 +563,7 @@ static void mxser_handle_cts(struct tty_struct *tty, struct mxser_port *info,
> } else if (cts)
> return;
>
> - tty->hw_stopped = 1;
> + tty->hw_stopped = true;
> if (!mxser_16550A_or_MUST(info))
> __mxser_stop_tx(info);
> }
> @@ -1361,7 +1361,7 @@ static void mxser_set_termios(struct tty_struct *tty,
> spin_unlock_irqrestore(&info->slock, flags);
>
> if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> mxser_start(tty);
> }
>
> diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
> index 33f258d6fef9..543b3224dce9 100644
> --- a/drivers/tty/synclink_gt.c
> +++ b/drivers/tty/synclink_gt.c
> @@ -730,7 +730,7 @@ static void set_termios(struct tty_struct *tty,
>
> /* Handle turning off CRTSCTS */
> if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
> - tty->hw_stopped = 0;
> + tty->hw_stopped = false;
> tx_release(tty);
> }
> }
> @@ -1953,13 +1953,13 @@ static void cts_change(struct slgt_info *info, unsigned short status)
> if (info->port.tty) {
> if (info->port.tty->hw_stopped) {
> if (info->signals & SerialSignal_CTS) {
> - info->port.tty->hw_stopped = 0;
> + info->port.tty->hw_stopped = false;
> info->pending_bh |= BH_TRANSMIT;
> return;
> }
> } else {
> if (!(info->signals & SerialSignal_CTS))
> - info->port.tty->hw_stopped = 1;
> + info->port.tty->hw_stopped = true;
> }
> }
> }
> diff --git a/include/linux/tty.h b/include/linux/tty.h
> index 093935e97f42..60871a9d3212 100644
> --- a/include/linux/tty.h
> +++ b/include/linux/tty.h
> @@ -227,7 +227,7 @@ struct tty_struct {
> unsigned long unused[0];
> } __aligned(sizeof(unsigned long)) ctrl;
>
> - int hw_stopped;
> + bool hw_stopped;
> unsigned int receive_room;
> int flow_change;
>
> --
> 2.30.2
>
@@ -1060,7 +1060,7 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
if (info->serial_signals & SerialSignal_CTS) {
if (debug_level >= DEBUG_LEVEL_ISR)
printk("CTS tx start...");
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
tx_start(info, tty);
info->pending_bh |= BH_TRANSMIT;
return;
@@ -1069,7 +1069,7 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
if (!(info->serial_signals & SerialSignal_CTS)) {
if (debug_level >= DEBUG_LEVEL_ISR)
printk("CTS tx stop...");
- tty->hw_stopped = 1;
+ tty->hw_stopped = true;
tx_stop(info);
}
}
@@ -2312,7 +2312,7 @@ static void mgslpc_set_termios(struct tty_struct *tty,
/* Handle turning off CRTSCTS */
if (old_termios->c_cflag & CRTSCTS && !C_CRTSCTS(tty)) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
tx_release(tty);
}
}
@@ -478,13 +478,13 @@ static void sdio_uart_check_modem_status(struct sdio_uart_port *port)
int cts = (status & UART_MSR_CTS);
if (tty->hw_stopped) {
if (cts) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
sdio_uart_start_tx(port);
tty_wakeup(tty);
}
} else {
if (!cts) {
- tty->hw_stopped = 1;
+ tty->hw_stopped = true;
sdio_uart_stop_tx(port);
}
}
@@ -633,7 +633,7 @@ static int sdio_uart_activate(struct tty_port *tport, struct tty_struct *tty)
if (C_CRTSCTS(tty))
if (!(sdio_uart_get_mctrl(port) & TIOCM_CTS))
- tty->hw_stopped = 1;
+ tty->hw_stopped = true;
clear_bit(TTY_IO_ERROR, &tty->flags);
@@ -882,14 +882,14 @@ static void sdio_uart_set_termios(struct tty_struct *tty,
/* Handle turning off CRTSCTS */
if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
sdio_uart_start_tx(port);
}
/* Handle turning on CRTSCTS */
if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
if (!(sdio_uart_get_mctrl(port) & TIOCM_CTS)) {
- tty->hw_stopped = 1;
+ tty->hw_stopped = true;
sdio_uart_stop_tx(port);
}
}
@@ -347,7 +347,7 @@ static void check_modem_status(struct serial_state *info)
#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
printk("CTS tx start...");
#endif
- port->tty->hw_stopped = 0;
+ port->tty->hw_stopped = false;
info->IER |= UART_IER_THRI;
amiga_custom.intena = IF_SETCLR | IF_TBE;
mb();
@@ -362,7 +362,7 @@ static void check_modem_status(struct serial_state *info)
#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
printk("CTS tx stop...");
#endif
- port->tty->hw_stopped = 1;
+ port->tty->hw_stopped = true;
info->IER &= ~UART_IER_THRI;
/* disable Tx interrupt and remove any pending interrupts */
amiga_custom.intena = IF_TBE;
@@ -1197,7 +1197,7 @@ static void rs_set_termios(struct tty_struct *tty, const struct ktermios *old_te
/* Handle turning off CRTSCTS */
if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
rs_start(tty);
}
@@ -553,7 +553,7 @@ static void mxser_handle_cts(struct tty_struct *tty, struct mxser_port *info,
if (tty->hw_stopped) {
if (cts) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
if (!mxser_16550A_or_MUST(info))
__mxser_start_tx(info);
@@ -563,7 +563,7 @@ static void mxser_handle_cts(struct tty_struct *tty, struct mxser_port *info,
} else if (cts)
return;
- tty->hw_stopped = 1;
+ tty->hw_stopped = true;
if (!mxser_16550A_or_MUST(info))
__mxser_stop_tx(info);
}
@@ -1361,7 +1361,7 @@ static void mxser_set_termios(struct tty_struct *tty,
spin_unlock_irqrestore(&info->slock, flags);
if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
mxser_start(tty);
}
@@ -730,7 +730,7 @@ static void set_termios(struct tty_struct *tty,
/* Handle turning off CRTSCTS */
if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
- tty->hw_stopped = 0;
+ tty->hw_stopped = false;
tx_release(tty);
}
}
@@ -1953,13 +1953,13 @@ static void cts_change(struct slgt_info *info, unsigned short status)
if (info->port.tty) {
if (info->port.tty->hw_stopped) {
if (info->signals & SerialSignal_CTS) {
- info->port.tty->hw_stopped = 0;
+ info->port.tty->hw_stopped = false;
info->pending_bh |= BH_TRANSMIT;
return;
}
} else {
if (!(info->signals & SerialSignal_CTS))
- info->port.tty->hw_stopped = 1;
+ info->port.tty->hw_stopped = true;
}
}
}
@@ -227,7 +227,7 @@ struct tty_struct {
unsigned long unused[0];
} __aligned(sizeof(unsigned long)) ctrl;
- int hw_stopped;
+ bool hw_stopped;
unsigned int receive_room;
int flow_change;