aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/sh-sci.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-09 11:09:17 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2012-07-12 23:43:08 -0400
commitd6fa5a4e7ab605370fd6c982782f84ef2e6660e7 (patch)
tree36da064efe953008c33e72c42b0ee49623932c70 /drivers/tty/serial/sh-sci.c
parentc471270d7a4161a8f1794202ad8338c0ec55759e (diff)
serial: sh-sci: prepare for conversion to the shdma base library
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Alan Cox <alan@linux.intel.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
-rw-r--r--drivers/tty/serial/sh-sci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 4604153b7954..21f7e53f7983 100644
--- 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)
1615 struct sh_dmae_slave *param = slave; 1615 struct sh_dmae_slave *param = slave;
1616 1616
1617 dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__, 1617 dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,
1618 param->slave_id); 1618 param->shdma_slave.slave_id);
1619 1619
1620 chan->private = param; 1620 chan->private = &param->shdma_slave;
1621 return true; 1621 return true;
1622} 1622}
1623 1623
@@ -1656,7 +1656,7 @@ static void sci_request_dma(struct uart_port *port)
1656 param = &s->param_tx; 1656 param = &s->param_tx;
1657 1657
1658 /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */ 1658 /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */
1659 param->slave_id = s->cfg->dma_slave_tx; 1659 param->shdma_slave.slave_id = s->cfg->dma_slave_tx;
1660 1660
1661 s->cookie_tx = -EINVAL; 1661 s->cookie_tx = -EINVAL;
1662 chan = dma_request_channel(mask, filter, param); 1662 chan = dma_request_channel(mask, filter, param);
@@ -1684,7 +1684,7 @@ static void sci_request_dma(struct uart_port *port)
1684 param = &s->param_rx; 1684 param = &s->param_rx;
1685 1685
1686 /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */ 1686 /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */
1687 param->slave_id = s->cfg->dma_slave_rx; 1687 param->shdma_slave.slave_id = s->cfg->dma_slave_rx;
1688 1688
1689 chan = dma_request_channel(mask, filter, param); 1689 chan = dma_request_channel(mask, filter, param);
1690 dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan); 1690 dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);