Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / tty / serial / pch_uart.c

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 46ec722b440603184b35466e89ec795185811066..08b9962b8fdab8813bbb453f120870eb1fbb96d3 100644 (file)
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -840,7 +840,7 @@ static int dma_handle_rx(struct eg20t_port *priv)
 
        sg_dma_address(sg) = priv->rx_buf_dma;
 
-       desc = priv->chan_rx->device->device_prep_slave_sg(priv->chan_rx,
+       desc = dmaengine_prep_slave_sg(priv->chan_rx,
                        sg, 1, DMA_DEV_TO_MEM,
                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
@@ -999,7 +999,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
                        sg_dma_len(sg) = size;
        }
 
-       desc = priv->chan_tx->device->device_prep_slave_sg(priv->chan_tx,
+       desc = dmaengine_prep_slave_sg(priv->chan_tx,
                                        priv->sg_tx_p, nent, DMA_MEM_TO_DEV,
                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        if (!desc) {