| Message ID | 20240110102102.61587-14-tudor.ambarus@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | serial: samsung: gs101 updates and winter cleanup | expand |
On Wed, Jan 10, 2024 at 4:24 AM Tudor Ambarus <tudor.ambarus@linaro.org> wrote: > > s3c24xx_serial_txempty_nofifo() returned either 0 or BIT(2), which is > counterintuitive. Make the method return bool, and return true when TX > is empty and false otherwise. > > Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> > --- > drivers/tty/serial/samsung_tty.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c > index 46fba70f3d77..63e993bed296 100644 > --- a/drivers/tty/serial/samsung_tty.c > +++ b/drivers/tty/serial/samsung_tty.c > @@ -236,9 +236,9 @@ static inline const char *s3c24xx_serial_portname(const struct uart_port *port) > return to_platform_device(port->dev)->name; > } > > -static int s3c24xx_serial_txempty_nofifo(const struct uart_port *port) > +static bool s3c24xx_serial_txempty_nofifo(const struct uart_port *port) > { > - return rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE; > + return !!(rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE); If the function already returns bool, I'm not sure doing !! is necessary. But I don't mind. Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > } > > static void s3c24xx_serial_rx_enable(struct uart_port *port) > @@ -782,7 +782,7 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport) > ch = rd_reg(port, S3C2410_URXH); > > if (port->flags & UPF_CONS_FLOW) { > - int txe = s3c24xx_serial_txempty_nofifo(port); > + bool txe = s3c24xx_serial_txempty_nofifo(port); > > if (ourport->rx_enabled) { > if (!txe) { > -- > 2.43.0.472.g3155946c3a-goog > >
diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 46fba70f3d77..63e993bed296 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -236,9 +236,9 @@ static inline const char *s3c24xx_serial_portname(const struct uart_port *port) return to_platform_device(port->dev)->name; } -static int s3c24xx_serial_txempty_nofifo(const struct uart_port *port) +static bool s3c24xx_serial_txempty_nofifo(const struct uart_port *port) { - return rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE; + return !!(rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE); } static void s3c24xx_serial_rx_enable(struct uart_port *port) @@ -782,7 +782,7 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport) ch = rd_reg(port, S3C2410_URXH); if (port->flags & UPF_CONS_FLOW) { - int txe = s3c24xx_serial_txempty_nofifo(port); + bool txe = s3c24xx_serial_txempty_nofifo(port); if (ourport->rx_enabled) { if (!txe) {
s3c24xx_serial_txempty_nofifo() returned either 0 or BIT(2), which is counterintuitive. Make the method return bool, and return true when TX is empty and false otherwise. Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> --- drivers/tty/serial/samsung_tty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)