tty: serial: switch from circ_buf to kfifo

[linux-block.git] / drivers / tty / serial / mvebu-uart.c

diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
index 0255646bc1752dd85b876694abbeaedb1909c87a..5de57b77abdb03f2fd46b2dc7f9bf7f00c34c15e 100644 (file)
--- a/drivers/tty/serial/mvebu-uart.c
+++ b/drivers/tty/serial/mvebu-uart.c
@@ -219,12 +219,10 @@ static void mvebu_uart_stop_tx(struct uart_port *port)
 static void mvebu_uart_start_tx(struct uart_port *port)
 {
        unsigned int ctl;
-       struct circ_buf *xmit = &port->state->xmit;
+       unsigned char c;
 
-       if (IS_EXTENDED(port) && !uart_circ_empty(xmit)) {
-               writel(xmit->buf[xmit->tail], port->membase + UART_TSH(port));
-               uart_xmit_advance(port, 1);
-       }
+       if (IS_EXTENDED(port) && uart_fifo_get(port, &c))
+               writel(c, port->membase + UART_TSH(port));
 
        ctl = readl(port->membase + UART_INTR(port));
        ctl |= CTRL_TX_RDY_INT(port);