Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / drivers / tty / serial / sh-sci.c

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1bd9163bc1181eb0aaeae952acfaf910911b3720..d4d8c9453cd8c8b3e01a056f2ce3a2e20926412d 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1615,9 +1615,9 @@ static bool filter(struct dma_chan *chan, void *slave)
        struct sh_dmae_slave *param = slave;
 
        dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,
-               param->slave_id);
+               param->shdma_slave.slave_id);
 
-       chan->private = param;
+       chan->private = &param->shdma_slave;
        return true;
 }
 
@@ -1656,7 +1656,7 @@ static void sci_request_dma(struct uart_port *port)
        param = &s->param_tx;
 
        /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */
-       param->slave_id = s->cfg->dma_slave_tx;
+       param->shdma_slave.slave_id = s->cfg->dma_slave_tx;
 
        s->cookie_tx = -EINVAL;
        chan = dma_request_channel(mask, filter, param);
@@ -1684,7 +1684,7 @@ static void sci_request_dma(struct uart_port *port)
        param = &s->param_rx;
 
        /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */
-       param->slave_id = s->cfg->dma_slave_rx;
+       param->shdma_slave.slave_id = s->cfg->dma_slave_rx;
 
        chan = dma_request_channel(mask, filter, param);
        dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);