Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071bb9e3 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: serial: clean up stop-tx part in altera_uart_tx_chars() 



[ Upstream commit d9c128117da41cf4cb0e80ae565b5d3ac79dffac ]

The "stop TX" path in altera_uart_tx_chars() is open-coded, so:
* use uart_circ_empty() to check if the buffer is empty, and
* when true, call altera_uart_stop_tx().

Cc: Tobias Klauser <tklauser@distanz.ch>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220920052049.20507-3-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 1307c5d33cce ("serial: altera_uart: fix locking in polling mode")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d1653882

drivers/tty/serial/altera_uart.c

+2 −4
Original line number Diff line number Diff line
@@ -274,10 +274,8 @@ static void altera_uart_tx_chars(struct altera_uart *pp) 
	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)

		uart_write_wakeup(port);



	if (xmit->head == xmit->tail) {

		pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK;

		altera_uart_update_ctrl_reg(pp);

	}

	if (uart_circ_empty(xmit))

		altera_uart_stop_tx(port);

}



static irqreturn_t altera_uart_interrupt(int irq, void *data)