lkml.org 
[lkml]   [2016]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 05/11] serial: 8250_dma: switch to new dmaengine_terminate_* API
    Date
    Convert dmaengine_terminate_all() calls to synchronous and asynchronous
    versions where appropriate.

    Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
    Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/tty/serial/8250/8250_dma.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
    index 3590d01..896e8f4 100644
    --- a/drivers/tty/serial/8250/8250_dma.c
    +++ b/drivers/tty/serial/8250/8250_dma.c
    @@ -142,7 +142,7 @@ void serial8250_rx_dma_flush(struct uart_8250_port *p)
    if (dma->rx_running) {
    dmaengine_pause(dma->rxchan);
    __dma_rx_complete(p);
    - dmaengine_terminate_all(dma->rxchan);
    + dmaengine_terminate_async(dma->rxchan);
    }
    }
    EXPORT_SYMBOL_GPL(serial8250_rx_dma_flush);
    @@ -247,14 +247,14 @@ void serial8250_release_dma(struct uart_8250_port *p)
    return;

    /* Release RX resources */
    - dmaengine_terminate_all(dma->rxchan);
    + dmaengine_terminate_sync(dma->rxchan);
    dma_free_coherent(dma->rxchan->device->dev, dma->rx_size, dma->rx_buf,
    dma->rx_addr);
    dma_release_channel(dma->rxchan);
    dma->rxchan = NULL;

    /* Release TX resources */
    - dmaengine_terminate_all(dma->txchan);
    + dmaengine_terminate_sync(dma->txchan);
    dma_unmap_single(dma->txchan->device->dev, dma->tx_addr,
    UART_XMIT_SIZE, DMA_TO_DEVICE);
    dma_release_channel(dma->txchan);
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-09-17 09:56    [W:3.978 / U:1.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site