aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/sh-sci.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2011-10-14 01:17:38 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2011-10-31 00:10:26 -0400
commita485df4b4404379786c4bdd258bc528b2617449d (patch)
tree67244495fab89846568cf40d3b7c3a2bd011133e /drivers/tty/serial/sh-sci.c
parent05f5799cbe5c9e2c03f604b3de5783cf4d726227 (diff)
spi, serial: move to dma_transfer_direction
fixup usage of dma direction by introducing dma_transfer_direction, this patch moves spi, serial drivers to use new enum Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Alan Cox <alan@linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
-rw-r--r--drivers/tty/serial/sh-sci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index dbd32a1286d3..3683a69b45ee 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1207,7 +1207,7 @@ static void sci_submit_rx(struct sci_port *s)
1207 struct dma_async_tx_descriptor *desc; 1207 struct dma_async_tx_descriptor *desc;
1208 1208
1209 desc = chan->device->device_prep_slave_sg(chan, 1209 desc = chan->device->device_prep_slave_sg(chan,
1210 sg, 1, DMA_FROM_DEVICE, DMA_PREP_INTERRUPT); 1210 sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);
1211 1211
1212 if (desc) { 1212 if (desc) {
1213 s->desc_rx[i] = desc; 1213 s->desc_rx[i] = desc;
@@ -1322,7 +1322,7 @@ static void work_fn_tx(struct work_struct *work)
1322 BUG_ON(!sg_dma_len(sg)); 1322 BUG_ON(!sg_dma_len(sg));
1323 1323
1324 desc = chan->device->device_prep_slave_sg(chan, 1324 desc = chan->device->device_prep_slave_sg(chan,
1325 sg, s->sg_len_tx, DMA_TO_DEVICE, 1325 sg, s->sg_len_tx, DMA_MEM_TO_DEV,
1326 DMA_PREP_INTERRUPT | DMA_CTRL_ACK); 1326 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
1327 if (!desc) { 1327 if (!desc) {
1328 /* switch to PIO */ 1328 /* switch to PIO */