diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2014-07-21 05:42:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-22 19:34:33 -0400 |
commit | 48479148a2f5311a45867469ae43c983bf3b6c88 (patch) | |
tree | 633830d68da8d897b37ab210e41bc6190f724e4d /drivers/tty | |
parent | 2fbe6c5e3e7f8d698d97984a9dce4f05c3d940ed (diff) |
drivers/tty/serial: use correct type for dma_map/unmap
dma_{un}map_* uses 'enum dma_data_direction' not 'enum dma_transfer_direction'.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/atmel_serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index c4f750314100..7b63677475c1 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c | |||
@@ -706,7 +706,7 @@ static void atmel_release_tx_dma(struct uart_port *port) | |||
706 | dmaengine_terminate_all(chan); | 706 | dmaengine_terminate_all(chan); |
707 | dma_release_channel(chan); | 707 | dma_release_channel(chan); |
708 | dma_unmap_sg(port->dev, &atmel_port->sg_tx, 1, | 708 | dma_unmap_sg(port->dev, &atmel_port->sg_tx, 1, |
709 | DMA_MEM_TO_DEV); | 709 | DMA_TO_DEVICE); |
710 | } | 710 | } |
711 | 711 | ||
712 | atmel_port->desc_tx = NULL; | 712 | atmel_port->desc_tx = NULL; |
@@ -804,7 +804,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port) | |||
804 | nent = dma_map_sg(port->dev, | 804 | nent = dma_map_sg(port->dev, |
805 | &atmel_port->sg_tx, | 805 | &atmel_port->sg_tx, |
806 | 1, | 806 | 1, |
807 | DMA_MEM_TO_DEV); | 807 | DMA_TO_DEVICE); |
808 | 808 | ||
809 | if (!nent) { | 809 | if (!nent) { |
810 | dev_dbg(port->dev, "need to release resource of dma\n"); | 810 | dev_dbg(port->dev, "need to release resource of dma\n"); |
@@ -883,7 +883,7 @@ static void atmel_release_rx_dma(struct uart_port *port) | |||
883 | dmaengine_terminate_all(chan); | 883 | dmaengine_terminate_all(chan); |
884 | dma_release_channel(chan); | 884 | dma_release_channel(chan); |
885 | dma_unmap_sg(port->dev, &atmel_port->sg_rx, 1, | 885 | dma_unmap_sg(port->dev, &atmel_port->sg_rx, 1, |
886 | DMA_DEV_TO_MEM); | 886 | DMA_FROM_DEVICE); |
887 | } | 887 | } |
888 | 888 | ||
889 | atmel_port->desc_rx = NULL; | 889 | atmel_port->desc_rx = NULL; |
@@ -968,7 +968,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) | |||
968 | nent = dma_map_sg(port->dev, | 968 | nent = dma_map_sg(port->dev, |
969 | &atmel_port->sg_rx, | 969 | &atmel_port->sg_rx, |
970 | 1, | 970 | 1, |
971 | DMA_DEV_TO_MEM); | 971 | DMA_FROM_DEVICE); |
972 | 972 | ||
973 | if (!nent) { | 973 | if (!nent) { |
974 | dev_dbg(port->dev, "need to release resource of dma\n"); | 974 | dev_dbg(port->dev, "need to release resource of dma\n"); |