Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

[platform/upstream/kernel-adaptation-pc.git] / drivers / tty / serial / sh-sci.c

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 9ec6d4e..bf461cf 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1341,7 +1341,7 @@ static void sci_submit_rx(struct sci_port *s)
                struct scatterlist *sg = &s->sg_rx[i];
                struct dma_async_tx_descriptor *desc;
 
-               desc = chan->device->device_prep_slave_sg(chan,
+               desc = dmaengine_prep_slave_sg(chan,
                        sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);
 
                if (desc) {
@@ -1456,7 +1456,7 @@ static void work_fn_tx(struct work_struct *work)
 
        BUG_ON(!sg_dma_len(sg));
 
-       desc = chan->device->device_prep_slave_sg(chan,
+       desc = dmaengine_prep_slave_sg(chan,
                        sg, s->sg_len_tx, DMA_MEM_TO_DEV,
                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        if (!desc) {