leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty/serial: at91: fix typo and indentation

Browse Source 
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>
This commit is contained in:
Cyrille Pitchen 2014-12-09 14:31:36 +01:00 committed by Greg Kroah-Hartman
parent 1cf6e8fc83
commit 1842dc2e29
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/tty/serial/atmel_serial.c
View File

@ -738,7 +738,11 @@ static void atmel_complete_tx_dma(void *arg)
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_write_wakeup(port); 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)) if (!uart_circ_empty(xmit))
tasklet_schedule(&atmel_port->tasklet); tasklet_schedule(&atmel_port->tasklet);
@ -797,11 +801,11 @@ static void atmel_tx_dma(struct uart_port *port)
BUG_ON(!sg_dma_len(sg)); BUG_ON(!sg_dma_len(sg));
desc = dmaengine_prep_slave_sg(chan, desc = dmaengine_prep_slave_sg(chan,
sg, sg,
1, 1,
DMA_MEM_TO_DEV, DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT | DMA_PREP_INTERRUPT |
DMA_CTRL_ACK); DMA_CTRL_ACK);
if (!desc) { if (!desc) {
dev_err(port->dev, "Failed to send via dma!\n"); dev_err(port->dev, "Failed to send via dma!\n");
return; return;
@ -1025,13 +1029,13 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
/* UART circular rx buffer is an aligned page. */ /* UART circular rx buffer is an aligned page. */
BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK);
sg_set_page(&atmel_port->sg_rx, sg_set_page(&atmel_port->sg_rx,
virt_to_page(ring->buf), virt_to_page(ring->buf),
ATMEL_SERIAL_RINGSIZE, ATMEL_SERIAL_RINGSIZE,
(int)ring->buf & ~PAGE_MASK); (int)ring->buf & ~PAGE_MASK);
nent = dma_map_sg(port->dev, nent = dma_map_sg(port->dev,
&atmel_port->sg_rx, &atmel_port->sg_rx,
1, 1,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
if (!nent) { if (!nent) {
dev_dbg(port->dev, "need to release resource of dma\n"); 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 * each one is half ring buffer size
*/ */
desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx, desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx,
sg_dma_address(&atmel_port->sg_rx), sg_dma_address(&atmel_port->sg_rx),
sg_dma_len(&atmel_port->sg_rx), sg_dma_len(&atmel_port->sg_rx),
sg_dma_len(&atmel_port->sg_rx)/2, sg_dma_len(&atmel_port->sg_rx)/2,
DMA_DEV_TO_MEM, DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT); DMA_PREP_INTERRUPT);
desc->callback = atmel_complete_rx_dma; desc->callback = atmel_complete_rx_dma;
desc->callback_param = port; desc->callback_param = port;
atmel_port->desc_rx = desc; atmel_port->desc_rx = desc;