diff options
author | Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2014-12-09 08:31:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-09 17:20:49 -0500 |
commit | 1842dc2e29855ef2d8ec2e5ff9f29add7e999ce8 (patch) | |
tree | 3edaa83675e38a4fba118ac0e612c1ab10f2136f /drivers/tty | |
parent | 1cf6e8fc8341e54f28aad706544a1d50c3a82ddc (diff) |
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/atmel_serial.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 9e0c63676f0a..846552bff67d 100644 --- 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) | |||
738 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 738 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
739 | uart_write_wakeup(port); | 739 | uart_write_wakeup(port); |
740 | 740 | ||
741 | /* Do we really need this? */ | 741 | /* |
742 | * xmit is a circular buffer so, if we have just send data from | ||
743 | * xmit->tail to the end of xmit->buf, now we have to transmit the | ||
744 | * remaining data from the beginning of xmit->buf to xmit->head. | ||
745 | */ | ||
742 | if (!uart_circ_empty(xmit)) | 746 | if (!uart_circ_empty(xmit)) |
743 | tasklet_schedule(&atmel_port->tasklet); | 747 | tasklet_schedule(&atmel_port->tasklet); |
744 | 748 | ||
@@ -797,11 +801,11 @@ static void atmel_tx_dma(struct uart_port *port) | |||
797 | BUG_ON(!sg_dma_len(sg)); | 801 | BUG_ON(!sg_dma_len(sg)); |
798 | 802 | ||
799 | desc = dmaengine_prep_slave_sg(chan, | 803 | desc = dmaengine_prep_slave_sg(chan, |
800 | sg, | 804 | sg, |
801 | 1, | 805 | 1, |
802 | DMA_MEM_TO_DEV, | 806 | DMA_MEM_TO_DEV, |
803 | DMA_PREP_INTERRUPT | | 807 | DMA_PREP_INTERRUPT | |
804 | DMA_CTRL_ACK); | 808 | DMA_CTRL_ACK); |
805 | if (!desc) { | 809 | if (!desc) { |
806 | dev_err(port->dev, "Failed to send via dma!\n"); | 810 | dev_err(port->dev, "Failed to send via dma!\n"); |
807 | return; | 811 | return; |
@@ -1025,13 +1029,13 @@ static int atmel_prepare_rx_dma(struct uart_port *port) | |||
1025 | /* UART circular rx buffer is an aligned page. */ | 1029 | /* UART circular rx buffer is an aligned page. */ |
1026 | BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); | 1030 | BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); |
1027 | sg_set_page(&atmel_port->sg_rx, | 1031 | sg_set_page(&atmel_port->sg_rx, |
1028 | virt_to_page(ring->buf), | 1032 | virt_to_page(ring->buf), |
1029 | ATMEL_SERIAL_RINGSIZE, | 1033 | ATMEL_SERIAL_RINGSIZE, |
1030 | (int)ring->buf & ~PAGE_MASK); | 1034 | (int)ring->buf & ~PAGE_MASK); |
1031 | nent = dma_map_sg(port->dev, | 1035 | nent = dma_map_sg(port->dev, |
1032 | &atmel_port->sg_rx, | 1036 | &atmel_port->sg_rx, |
1033 | 1, | 1037 | 1, |
1034 | DMA_FROM_DEVICE); | 1038 | DMA_FROM_DEVICE); |
1035 | 1039 | ||
1036 | if (!nent) { | 1040 | if (!nent) { |
1037 | dev_dbg(port->dev, "need to release resource of dma\n"); | 1041 | 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) | |||
1060 | * each one is half ring buffer size | 1064 | * each one is half ring buffer size |
1061 | */ | 1065 | */ |
1062 | desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx, | 1066 | desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx, |
1063 | sg_dma_address(&atmel_port->sg_rx), | 1067 | sg_dma_address(&atmel_port->sg_rx), |
1064 | sg_dma_len(&atmel_port->sg_rx), | 1068 | sg_dma_len(&atmel_port->sg_rx), |
1065 | sg_dma_len(&atmel_port->sg_rx)/2, | 1069 | sg_dma_len(&atmel_port->sg_rx)/2, |
1066 | DMA_DEV_TO_MEM, | 1070 | DMA_DEV_TO_MEM, |
1067 | DMA_PREP_INTERRUPT); | 1071 | DMA_PREP_INTERRUPT); |
1068 | desc->callback = atmel_complete_rx_dma; | 1072 | desc->callback = atmel_complete_rx_dma; |
1069 | desc->callback_param = port; | 1073 | desc->callback_param = port; |
1070 | atmel_port->desc_rx = desc; | 1074 | atmel_port->desc_rx = desc; |