Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6fa5a4e authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Vinod Koul
Browse files

serial: sh-sci: prepare for conversion to the shdma base library 



Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent c471270d

drivers/tty/serial/sh-sci.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1615,9 +1615,9 @@ static bool filter(struct dma_chan *chan, void *slave) 
	struct sh_dmae_slave *param = slave;

	struct sh_dmae_slave *param = slave;





	dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,

	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;

	return true;

}

}
@@ -1656,7 +1656,7 @@ static void sci_request_dma(struct uart_port *port) 
	param = &s->param_tx;

	param = &s->param_tx;





	/* Slave ID, e.g., SHDMA_SLAVE_SCIF0_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;

	s->cookie_tx = -EINVAL;

	chan = dma_request_channel(mask, filter, param);

	chan = dma_request_channel(mask, filter, param);
@@ -1684,7 +1684,7 @@ static void sci_request_dma(struct uart_port *port) 
	param = &s->param_rx;

	param = &s->param_rx;





	/* Slave ID, e.g., SHDMA_SLAVE_SCIF0_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);

	chan = dma_request_channel(mask, filter, param);

	dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);

	dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);