tty: serial: switch from circ_buf to kfifo

[linux-block.git] / drivers / tty / serial / 8250 / 8250_bcm7271.c

diff --git a/drivers/tty/serial/8250/8250_bcm7271.c b/drivers/tty/serial/8250/8250_bcm7271.c
index 5daa38d9c64e01d32cb1c10e48da065998dfbaa3..de270863eb5e14961930221bb36831425972e0f0 100644 (file)
--- a/drivers/tty/serial/8250/8250_bcm7271.c
+++ b/drivers/tty/serial/8250/8250_bcm7271.c
@@ -413,20 +413,18 @@ static int stop_tx_dma(struct uart_8250_port *p)
 static int brcmuart_tx_dma(struct uart_8250_port *p)
 {
        struct brcmuart_priv *priv = p->port.private_data;
-       struct circ_buf *xmit = &p->port.state->xmit;
+       struct tty_port *tport = &p->port.state->port;
        u32 tx_size;
 
        if (uart_tx_stopped(&p->port) || priv->tx_running ||
-               uart_circ_empty(xmit)) {
+               kfifo_is_empty(&tport->xmit_fifo)) {
                return 0;
        }
-       tx_size = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);
 
        priv->dma.tx_err = 0;
-       memcpy(priv->tx_buf, &xmit->buf[xmit->tail], tx_size);
-       uart_xmit_advance(&p->port, tx_size);
+       tx_size = uart_fifo_out(&p->port, priv->tx_buf, UART_XMIT_SIZE);
 
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+       if (kfifo_len(&tport->xmit_fifo) < WAKEUP_CHARS)
                uart_write_wakeup(&p->port);
 
        udma_writel(priv, REGS_DMA_TX, UDMA_TX_TRANSFER_LEN, tx_size);
@@ -540,7 +538,7 @@ static void brcmuart_tx_isr(struct uart_port *up, u32 isr)
        struct brcmuart_priv *priv = up->private_data;
        struct device *dev = up->dev;
        struct uart_8250_port *port_8250 = up_to_u8250p(up);
-       struct circ_buf *xmit = &port_8250->port.state->xmit;
+       struct tty_port *tport = &port_8250->port.state->port;
 
        if (isr & UDMA_INTR_TX_ABORT) {
                if (priv->tx_running)
@@ -548,7 +546,7 @@ static void brcmuart_tx_isr(struct uart_port *up, u32 isr)
                return;
        }
        priv->tx_running = false;
-       if (!uart_circ_empty(xmit) && !uart_tx_stopped(up))
+       if (!kfifo_is_empty(&tport->xmit_fifo) && !uart_tx_stopped(up))
                brcmuart_tx_dma(port_8250);
 }