diff options
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
-rw-r--r-- | drivers/tty/serial/amba-pl011.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index db7f88a1bdee..f9dcb5379b92 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 | /* |