tty/serial: at91: fix typo and indentation

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 9e0c63676f0a4e5c2f78d7340dd3c0e62b2d01bc..846552bff67d6f005c3966e80368134dcd9ab27f 100644 (file)
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -738,7 +738,11 @@ static void atmel_complete_tx_dma(void *arg)
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                uart_write_wakeup(port);
 
-       /* Do we really need this? */
+       /*
+        * xmit is a circular buffer so, if we have just send data from
+        * xmit->tail to the end of xmit->buf, now we have to transmit the
+        * remaining data from the beginning of xmit->buf to xmit->head.
+        */
        if (!uart_circ_empty(xmit))
                tasklet_schedule(&atmel_port->tasklet);
 
@@ -797,11 +801,11 @@ static void atmel_tx_dma(struct uart_port *port)
                BUG_ON(!sg_dma_len(sg));
 
                desc = dmaengine_prep_slave_sg(chan,
-                                               sg,
-                                               1,
-                                               DMA_MEM_TO_DEV,
-                                               DMA_PREP_INTERRUPT |
-                                               DMA_CTRL_ACK);
+                                              sg,
+                                              1,
+                                              DMA_MEM_TO_DEV,
+                                              DMA_PREP_INTERRUPT |
+                                              DMA_CTRL_ACK);
                if (!desc) {
                        dev_err(port->dev, "Failed to send via dma!\n");
                        return;
@@ -1025,13 +1029,13 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
        /* UART circular rx buffer is an aligned page. */
        BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK);
        sg_set_page(&atmel_port->sg_rx,
-                       virt_to_page(ring->buf),
-                       ATMEL_SERIAL_RINGSIZE,
-                       (int)ring->buf & ~PAGE_MASK);
-                       nent = dma_map_sg(port->dev,
-                                       &atmel_port->sg_rx,
-                                       1,
-                                       DMA_FROM_DEVICE);
+                   virt_to_page(ring->buf),
+                   ATMEL_SERIAL_RINGSIZE,
+                   (int)ring->buf & ~PAGE_MASK);
+       nent = dma_map_sg(port->dev,
+                         &atmel_port->sg_rx,
+                         1,
+                         DMA_FROM_DEVICE);
 
        if (!nent) {
                dev_dbg(port->dev, "need to release resource of dma\n");
@@ -1060,11 +1064,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
         * each one is half ring buffer size
         */
        desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx,
-                               sg_dma_address(&atmel_port->sg_rx),
-                               sg_dma_len(&atmel_port->sg_rx),
-                               sg_dma_len(&atmel_port->sg_rx)/2,
-                               DMA_DEV_TO_MEM,
-                               DMA_PREP_INTERRUPT);
+                                        sg_dma_address(&atmel_port->sg_rx),
+                                        sg_dma_len(&atmel_port->sg_rx),
+                                        sg_dma_len(&atmel_port->sg_rx)/2,
+                                        DMA_DEV_TO_MEM,
+                                        DMA_PREP_INTERRUPT);
        desc->callback = atmel_complete_rx_dma;
        desc->callback_param = port;
        atmel_port->desc_rx = desc;