mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

tty: serial: fsl_lpuart: Introduce lpuart_stopped_or_empty()

Browse source 
The check for

    uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)

appears in multiple places in the driver. Move it into a helper
function.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-imx@nxp.com
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Link: https://lore.kernel.org/r/20190729195226.8862-17-andrew.smirnov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrey Smirnov 2019-07-29 12:52:18 -07:00 committed by Greg Kroah-Hartman
parent f2f5e04c75
commit a90fa53282
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/tty/serial/fsl_lpuart.c
View file

@ -452,6 +452,11 @@ static void lpuart_dma_tx(struct lpuart_port *sport)
dma_async_issue_pending(sport->dma_tx_chan); dma_async_issue_pending(sport->dma_tx_chan);
} }
static bool lpuart_stopped_or_empty(struct uart_port *port)
{
return uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port);
}
static void lpuart_dma_tx_complete(void *arg) static void lpuart_dma_tx_complete(void *arg)
{ {
struct lpuart_port *sport = arg; struct lpuart_port *sport = arg;
@ -479,7 +484,7 @@ static void lpuart_dma_tx_complete(void *arg)
spin_lock_irqsave(&sport->port.lock, flags); spin_lock_irqsave(&sport->port.lock, flags);
if (!uart_circ_empty(xmit) && !uart_tx_stopped(&sport->port)) if (!lpuart_stopped_or_empty(&sport->port))
lpuart_dma_tx(sport); lpuart_dma_tx(sport);
spin_unlock_irqrestore(&sport->port.lock, flags); spin_unlock_irqrestore(&sport->port.lock, flags);
@ -680,7 +685,7 @@ static inline void lpuart_transmit_buffer(struct lpuart_port *sport)
return; return;
} }
if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) { if (lpuart_stopped_or_empty(&sport->port)) {
lpuart_stop_tx(&sport->port); lpuart_stop_tx(&sport->port);
return; return;
} }
@ -711,7 +716,7 @@ static inline void lpuart32_transmit_buffer(struct lpuart_port *sport)
return; return;
} }
if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) { if (lpuart_stopped_or_empty(&sport->port)) {
lpuart32_stop_tx(&sport->port); lpuart32_stop_tx(&sport->port);
return; return;
} }
@ -739,14 +744,13 @@ static void lpuart_start_tx(struct uart_port *port)
{ {
struct lpuart_port *sport = container_of(port, struct lpuart_port *sport = container_of(port,
struct lpuart_port, port); struct lpuart_port, port);
struct circ_buf *xmit = &sport->port.state->xmit;
unsigned char temp; unsigned char temp;
temp = readb(port->membase + UARTCR2); temp = readb(port->membase + UARTCR2);
writeb(temp | UARTCR2_TIE, port->membase + UARTCR2); writeb(temp | UARTCR2_TIE, port->membase + UARTCR2);
if (sport->lpuart_dma_tx_use) { if (sport->lpuart_dma_tx_use) {
if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) if (!lpuart_stopped_or_empty(port))
lpuart_dma_tx(sport); lpuart_dma_tx(sport);
} else { } else {
if (readb(port->membase + UARTSR1) & UARTSR1_TDRE) if (readb(port->membase + UARTSR1) & UARTSR1_TDRE)
@ -757,11 +761,10 @@ static void lpuart_start_tx(struct uart_port *port)
static void lpuart32_start_tx(struct uart_port *port) static void lpuart32_start_tx(struct uart_port *port)
{ {
struct lpuart_port *sport = container_of(port, struct lpuart_port, port); struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
struct circ_buf *xmit = &sport->port.state->xmit;
unsigned long temp; unsigned long temp;
if (sport->lpuart_dma_tx_use) { if (sport->lpuart_dma_tx_use) {
if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) if (!lpuart_stopped_or_empty(port))
lpuart_dma_tx(sport); lpuart_dma_tx(sport);
} else { } else {
temp = lpuart32_read(port, UARTCTRL); temp = lpuart32_read(port, UARTCTRL);