diff options
author | Alexandre Bounine <alexandre.bounine@idt.com> | 2012-03-08 16:11:18 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-21 09:50:22 -0400 |
commit | 16052827d98fbc13c31ebad560af4bd53e2b4dd5 (patch) | |
tree | aff4f3362a643d2d4621f21dd56996988c0e733c /drivers/tty | |
parent | ad1122e545b55013089e6cc18ac37b47b46f2a7d (diff) |
dmaengine/dma_slave: introduce inline wrappers
Add inline wrappers for device_prep_slave_sg() and device_prep_dma_cyclic()
interfaces to hide new parameter from current users of affected interfaces.
Convert current users to use new wrappers instead of direct calls.
Suggested by Russell King [https://lkml.org/lkml/2012/2/3/269].
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/amba-pl011.c | 6 | ||||
-rw-r--r-- | drivers/tty/serial/pch_uart.c | 4 | ||||
-rw-r--r-- | drivers/tty/serial/sh-sci.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index db7f88a1bde..f9dcb5379b9 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c | |||
@@ -483,7 +483,7 @@ static int pl011_dma_tx_refill(struct uart_amba_port *uap) | |||
483 | return -EBUSY; | 483 | return -EBUSY; |
484 | } | 484 | } |
485 | 485 | ||
486 | desc = dma_dev->device_prep_slave_sg(chan, &dmatx->sg, 1, DMA_MEM_TO_DEV, | 486 | desc = dmaengine_prep_slave_sg(chan, &dmatx->sg, 1, DMA_MEM_TO_DEV, |
487 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 487 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
488 | if (!desc) { | 488 | if (!desc) { |
489 | dma_unmap_sg(dma_dev->dev, &dmatx->sg, 1, DMA_TO_DEVICE); | 489 | dma_unmap_sg(dma_dev->dev, &dmatx->sg, 1, DMA_TO_DEVICE); |
@@ -666,7 +666,6 @@ static void pl011_dma_rx_callback(void *data); | |||
666 | static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap) | 666 | static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap) |
667 | { | 667 | { |
668 | struct dma_chan *rxchan = uap->dmarx.chan; | 668 | struct dma_chan *rxchan = uap->dmarx.chan; |
669 | struct dma_device *dma_dev; | ||
670 | struct pl011_dmarx_data *dmarx = &uap->dmarx; | 669 | struct pl011_dmarx_data *dmarx = &uap->dmarx; |
671 | struct dma_async_tx_descriptor *desc; | 670 | struct dma_async_tx_descriptor *desc; |
672 | struct pl011_sgbuf *sgbuf; | 671 | struct pl011_sgbuf *sgbuf; |
@@ -677,8 +676,7 @@ static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap) | |||
677 | /* Start the RX DMA job */ | 676 | /* Start the RX DMA job */ |
678 | sgbuf = uap->dmarx.use_buf_b ? | 677 | sgbuf = uap->dmarx.use_buf_b ? |
679 | &uap->dmarx.sgbuf_b : &uap->dmarx.sgbuf_a; | 678 | &uap->dmarx.sgbuf_b : &uap->dmarx.sgbuf_a; |
680 | dma_dev = rxchan->device; | 679 | desc = dmaengine_prep_slave_sg(rxchan, &sgbuf->sg, 1, |
681 | desc = rxchan->device->device_prep_slave_sg(rxchan, &sgbuf->sg, 1, | ||
682 | DMA_DEV_TO_MEM, | 680 | DMA_DEV_TO_MEM, |
683 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 681 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
684 | /* | 682 | /* |
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 17ae65762d1..61743bdc439 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c | |||
@@ -763,7 +763,7 @@ static int dma_handle_rx(struct eg20t_port *priv) | |||
763 | 763 | ||
764 | sg_dma_address(sg) = priv->rx_buf_dma; | 764 | sg_dma_address(sg) = priv->rx_buf_dma; |
765 | 765 | ||
766 | desc = priv->chan_rx->device->device_prep_slave_sg(priv->chan_rx, | 766 | desc = dmaengine_prep_slave_sg(priv->chan_rx, |
767 | sg, 1, DMA_DEV_TO_MEM, | 767 | sg, 1, DMA_DEV_TO_MEM, |
768 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 768 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
769 | 769 | ||
@@ -922,7 +922,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv) | |||
922 | sg_dma_len(sg) = size; | 922 | sg_dma_len(sg) = size; |
923 | } | 923 | } |
924 | 924 | ||
925 | desc = priv->chan_tx->device->device_prep_slave_sg(priv->chan_tx, | 925 | desc = dmaengine_prep_slave_sg(priv->chan_tx, |
926 | priv->sg_tx_p, nent, DMA_MEM_TO_DEV, | 926 | priv->sg_tx_p, nent, DMA_MEM_TO_DEV, |
927 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 927 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
928 | if (!desc) { | 928 | if (!desc) { |
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 75085795528..872557f89cc 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
@@ -1338,7 +1338,7 @@ static void sci_submit_rx(struct sci_port *s) | |||
1338 | struct scatterlist *sg = &s->sg_rx[i]; | 1338 | struct scatterlist *sg = &s->sg_rx[i]; |
1339 | struct dma_async_tx_descriptor *desc; | 1339 | struct dma_async_tx_descriptor *desc; |
1340 | 1340 | ||
1341 | desc = chan->device->device_prep_slave_sg(chan, | 1341 | desc = dmaengine_prep_slave_sg(chan, |
1342 | sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); | 1342 | sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); |
1343 | 1343 | ||
1344 | if (desc) { | 1344 | if (desc) { |
@@ -1453,7 +1453,7 @@ static void work_fn_tx(struct work_struct *work) | |||
1453 | 1453 | ||
1454 | BUG_ON(!sg_dma_len(sg)); | 1454 | BUG_ON(!sg_dma_len(sg)); |
1455 | 1455 | ||
1456 | desc = chan->device->device_prep_slave_sg(chan, | 1456 | desc = dmaengine_prep_slave_sg(chan, |
1457 | sg, s->sg_len_tx, DMA_MEM_TO_DEV, | 1457 | sg, s->sg_len_tx, DMA_MEM_TO_DEV, |
1458 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 1458 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
1459 | if (!desc) { | 1459 | if (!desc) { |