Commit 34619de1 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

serial: Consolidate BOTH_EMPTY use 



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.

Reviewed-by: default avatarJiri Slaby <jirislaby@kernel.org>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220624205424.12686-7-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb47b59a

arch/mips/ath79/early_printk.c

+5 −4
Original line number Diff line number Diff line
@@ -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);

}



static void prom_putchar_ar933x(char ch)

drivers/accessibility/speakup/serialio.h

+1 −2
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ struct old_serial_port { 
#define NUM_DISABLE_TIMEOUTS 3

/* buffer timeout in ms */

#define SPK_TIMEOUT 100

#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)



#define spk_serial_tx_busy() \

	((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)

	(!uart_lsr_tx_empty(inb(speakup_info.port_tts + UART_LSR)))



#endif

drivers/tty/serial/8250/8250_early.c

+1 −3
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ static void serial8250_early_out(struct uart_port *port, int offset, int value) 
	}

}



#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)



static void serial_putc(struct uart_port *port, unsigned char c)

{

	unsigned int status;
@@ -94,7 +92,7 @@ static void serial_putc(struct uart_port *port, unsigned char c) 


	for (;;) {

		status = serial8250_early_in(port, UART_LSR);

		if ((status & BOTH_EMPTY) == BOTH_EMPTY)

		if (uart_lsr_tx_empty(status))

			break;

		cpu_relax();

	}

drivers/tty/serial/8250/8250_port.c

+5 −7
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 
#define DEBUG_AUTOCONF(fmt...)	do { } while (0)

#endif



#define BOTH_EMPTY	(UART_LSR_TEMT | UART_LSR_THRE)



/*

 * Here we define the default xmit fifo size used for each type of UART.

 */
@@ -1843,7 +1841,7 @@ void serial8250_tx_chars(struct uart_8250_port *up) 
		if (uart_circ_empty(xmit))

			break;

		if ((up->capabilities & UART_CAP_HFIFO) &&

		    (serial_in(up, UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)

		    !uart_lsr_tx_empty(serial_in(up, UART_LSR)))

			break;

		/* The BCM2835 MINI UART THRE bit is really a not-full bit. */

		if ((up->capabilities & UART_CAP_MINI) &&
@@ -2003,7 +2001,7 @@ static unsigned int serial8250_tx_empty(struct uart_port *port) 


	serial8250_rpm_put(up);



	return (lsr & BOTH_EMPTY) == BOTH_EMPTY ? TIOCSER_TEMT : 0;

	return uart_lsr_tx_empty(lsr) ? TIOCSER_TEMT : 0;

}



unsigned int serial8250_do_get_mctrl(struct uart_port *port)
@@ -2151,7 +2149,7 @@ static void serial8250_put_poll_char(struct uart_port *port, 
	else

		serial_port_out(port, UART_IER, 0);



	wait_for_xmitr(up, BOTH_EMPTY);

	wait_for_xmitr(up, UART_LSR_BOTH_EMPTY);

	/*

	 *	Send the character out.

	 */
@@ -2161,7 +2159,7 @@ static void serial8250_put_poll_char(struct uart_port *port, 
	 *	Finally, wait for transmitter to become empty

	 *	and restore the IER

	 */

	wait_for_xmitr(up, BOTH_EMPTY);

	wait_for_xmitr(up, UART_LSR_BOTH_EMPTY);

	serial_port_out(port, UART_IER, ier);

	serial8250_rpm_put(up);

}
@@ -3431,7 +3429,7 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s, 
	 *	Finally, wait for transmitter to become empty

	 *	and restore the IER

	 */

	wait_for_xmitr(up, BOTH_EMPTY);

	wait_for_xmitr(up, UART_LSR_BOTH_EMPTY);



	if (em485) {

		mdelay(port->rs485.delay_rts_after_send);

drivers/tty/serial/omap-serial.c

+3 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/console.h>

#include <linux/serial.h>

#include <linux/serial_reg.h>

#include <linux/delay.h>

#include <linux/slab.h>
@@ -1102,8 +1103,6 @@ serial_omap_type(struct uart_port *port) 
	return up->name;

}



#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)



static void __maybe_unused wait_for_xmitr(struct uart_omap_port *up)

{

	unsigned int status, tmout = 10000;
@@ -1118,7 +1117,7 @@ static void __maybe_unused wait_for_xmitr(struct uart_omap_port *up) 
		if (--tmout == 0)

			break;

		udelay(1);

	} while ((status & BOTH_EMPTY) != BOTH_EMPTY);

	} while (!uart_lsr_tx_empty(status));



	/* Wait up to 1s for flow control if necessary */

	if (up->port.flags & UPF_CONS_FLOW) {
@@ -1186,7 +1185,7 @@ static void omap_serial_early_putc(struct uart_port *port, unsigned char c) 


	for (;;) {

		status = omap_serial_early_in(port, UART_LSR);

		if ((status & BOTH_EMPTY) == BOTH_EMPTY)

		if (uart_lsr_tx_empty(status))

			break;

		cpu_relax();

	}