diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-08-21 20:02:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 18:33:48 +0200 |
| commit | 32f2ce031f41dc244d3fac71e7bd1d4952d7381b (patch) | |
| tree | 6fb25cdce055d0fbcac13085641295c7599694bf /drivers/tty/serial | |
| parent | serial: sh-sci: Switch to generic DMA residue handling (diff) | |
| download | linux-32f2ce031f41dc244d3fac71e7bd1d4952d7381b.tar.xz linux-32f2ce031f41dc244d3fac71e7bd1d4952d7381b.zip | |
serial: sh-sci: Stop acknowledging DMA transmit completions
As dmaengine_prep_slave_sg() is called with the DMA_CTRL_ACK flag set
for DMA transmit requests, there's no need to explicitly acknowledge DMA
transmit requests in the DMA transmit completion callback.
Hence remove the call to async_tx_ack(), and remove the now unused
dma_async_tx_descriptor pointer in the sci_port structure.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 049036dfb6dd..1191a6c48664 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -104,7 +104,6 @@ struct sci_port { struct dma_chan *chan_rx; #ifdef CONFIG_SERIAL_SH_SCI_DMA - struct dma_async_tx_descriptor *desc_tx; struct dma_async_tx_descriptor *desc_rx[2]; dma_cookie_t cookie_tx; dma_cookie_t cookie_rx[2]; @@ -1285,9 +1284,6 @@ static void sci_dma_tx_complete(void *arg) port->icount.tx += s->tx_dma_len; - async_tx_ack(s->desc_tx); - s->desc_tx = NULL; - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) uart_write_wakeup(port); @@ -1528,7 +1524,6 @@ static void work_fn_tx(struct work_struct *work) DMA_TO_DEVICE); spin_lock_irq(&port->lock); - s->desc_tx = desc; desc->callback = sci_dma_tx_complete; desc->callback_param = s; spin_unlock_irq(&port->lock); |