lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v2 6/6] serial: Consolidate BOTH_EMPTY use
From
On 21. 06. 22, 14:49, Ilpo Järvinen wrote:
> Per file BOTH_EMPTY defines are littering our source code here and
> there. Define once in serial.h and create helper for the check
> too.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

Reviewed-by: Jiri Slaby <jirislaby@kernel.org>

> --- a/arch/mips/ath79/early_printk.c
> +++ b/arch/mips/ath79/early_printk.c
> @@ -8,6 +8,7 @@
>
> #include <linux/io.h>
> #include <linux/errno.h>
> +#include <linux/serial.h>
> #include <linux/serial_reg.h>
> #include <asm/addrspace.h>
> #include <asm/setup.h>
> @@ -29,15 +30,15 @@ static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val)
> } while (1);
> }
>
> -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
> -
> static void prom_putchar_ar71xx(char ch)
> {
> void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));
>
> - prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY);
> + prom_putchar_wait(base + UART_LSR * 4, UART_LSR_BOTH_EMPTY,
> + UART_LSR_BOTH_EMPTY);
> __raw_writel((unsigned char)ch, base + UART_TX * 4);
> - prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY);
> + prom_putchar_wait(base + UART_LSR * 4, UART_LSR_BOTH_EMPTY,
> + UART_LSR_BOTH_EMPTY);

Two observations apart from this patch:
* prom_putchar_wait()'s last two parameters are always the same.
One should be removed, i.e. all this simplified.
* prom_putchar_wait() should be implemented using
read_poll_timeout_atomic(), incl. failure/timeout handling.

thanks,
--
js
suse labs

\
 
 \ /
  Last update: 2022-06-23 09:43    [W:0.154 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site