From: Jiri Slaby <jslaby@suse.cz>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
johan@kernel.org, Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH 11/11] serial: mcf: use helpers in mcf_tx_chars()
Date: Mon, 24 Jan 2022 08:14:30 +0100 [thread overview]
Message-ID: <20220124071430.14907-12-jslaby@suse.cz> (raw)
In-Reply-To: <20220124071430.14907-1-jslaby@suse.cz>
Use uart_circ_empty() instead of open-coding it via xmit->head & tail.
Use preexisting mcf_stop_tx() to avoid stop-tx code duplication.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/serial/mcf.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index c7cec7d03620..2aec62b5d6c4 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -338,7 +338,7 @@ static void mcf_tx_chars(struct mcf_uart *pp)
}
while (readb(port->membase + MCFUART_USR) & MCFUART_USR_TXREADY) {
- if (xmit->head == xmit->tail)
+ if (uart_circ_empty(xmit))
break;
writeb(xmit->buf[xmit->tail], port->membase + MCFUART_UTB);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE -1);
@@ -348,9 +348,8 @@ static void mcf_tx_chars(struct mcf_uart *pp)
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_write_wakeup(port);
- if (xmit->head == xmit->tail) {
- pp->imr &= ~MCFUART_UIR_TXREADY;
- writeb(pp->imr, port->membase + MCFUART_UIMR);
+ if (uart_circ_empty(xmit)) {
+ mcf_stop_tx(port);
/* Disable TX to negate RTS automatically */
if (port->rs485.flags & SER_RS485_ENABLED)
writeb(MCFUART_UCR_TXDISABLE,
--
2.34.1
prev parent reply other threads:[~2022-01-24 7:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 7:14 [PATCH 00/11] TTY patches for 5.18 Jiri Slaby
2022-01-24 7:14 ` [PATCH 01/11] serial: core: clean up EXPORT_SYMBOLs Jiri Slaby
2022-01-24 7:14 ` [PATCH 02/11] serial: atmel_serial: include circ_buf.h Jiri Slaby
2022-01-24 8:46 ` Richard Genoud
2022-01-24 8:49 ` Richard Genoud
2022-01-24 7:14 ` [PATCH 03/11] tty: add kfifo to tty_port Jiri Slaby
2022-01-24 7:14 ` [PATCH 04/11] tty: tty_port_open, document shutdown vs failed activate Jiri Slaby
2022-01-24 7:14 ` [PATCH 05/11] mxser: fix xmit_buf leak in activate when LSR == 0xff Jiri Slaby
2022-01-24 7:14 ` [PATCH 06/11] mxser: use tty_port xmit_buf helpers Jiri Slaby
2022-01-24 7:14 ` [PATCH 07/11] mxser: switch from xmit_buf to kfifo Jiri Slaby
2022-01-24 7:14 ` [PATCH 08/11] serial: fsl_linflexuart: deduplicate character sending Jiri Slaby
2022-01-24 7:14 ` [PATCH 09/11] serial: fsl_linflexuart: don't call uart_write_wakeup() twice Jiri Slaby
2022-01-24 7:14 ` [PATCH 10/11] serial: make uart_console_write->putchar()'s character a char Jiri Slaby
2022-01-24 9:06 ` Richard Genoud
2022-01-24 14:30 ` kernel test robot
2022-01-26 7:26 ` Jiri Slaby
2022-01-26 13:55 ` Greg KH
2022-01-24 16:23 ` kernel test robot
2022-01-26 17:57 ` Maciej W. Rozycki
2022-01-27 8:09 ` Jiri Slaby
2022-01-24 7:14 ` Jiri Slaby [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220124071430.14907-12-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®