OSDN Git Service

tty/serial: at91: use correct type for dma_sync_*_for_cpu() and dma_sync_*_for_device()
authorCyrille Pitchen <cyrille.pitchen@atmel.com>
Tue, 9 Dec 2014 13:31:32 +0000 (14:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jan 2015 22:20:49 +0000 (14:20 -0800)
dma_sync_*_for_cpu() and dma_sync_*_for_device() use 'enum dma_data_direction',
not 'enum dma_transfer_direction'

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/atmel_serial.c

index 4d848a2..756f567 100644 (file)
@@ -794,7 +794,7 @@ static void atmel_tx_dma(struct uart_port *port)
                        return;
                }
 
-               dma_sync_sg_for_device(port->dev, sg, 1, DMA_MEM_TO_DEV);
+               dma_sync_sg_for_device(port->dev, sg, 1, DMA_TO_DEVICE);
 
                atmel_port->desc_tx = desc;
                desc->callback = atmel_complete_tx_dma;
@@ -927,7 +927,7 @@ static void atmel_rx_from_dma(struct uart_port *port)
        dma_sync_sg_for_cpu(port->dev,
                            &atmel_port->sg_rx,
                            1,
-                           DMA_DEV_TO_MEM);
+                           DMA_FROM_DEVICE);
 
        /*
         * ring->head points to the end of data already written by the DMA.
@@ -974,7 +974,7 @@ static void atmel_rx_from_dma(struct uart_port *port)
        dma_sync_sg_for_device(port->dev,
                               &atmel_port->sg_rx,
                               1,
-                              DMA_DEV_TO_MEM);
+                              DMA_FROM_DEVICE);
 
        /*
         * Drop the lock here since it might end up calling