[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1337056029.16185.5363.camel@vkoul-udesk3>
Date: Tue, 15 May 2012 09:57:09 +0530
From: Vinod Koul <vkoul@...radead.org>
To: Guennadi Liakhovetski <g.liakhovetski@....de>
Cc: vinod.koul@...el.com, linux-kernel@...r.kernel.org,
Magnus Damm <magnus.damm@...il.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>,
Paul Mundt <lethal@...ux-sh.org>, linux-sh@...r.kernel.org,
Alan Cox <alan@...ux.intel.com>
Subject: Re: [PATCH 5/9 v3] serial: sh-sci: prepare for conversion to the
shdma base library
On Wed, 2012-05-09 at 17:09 +0200, Guennadi Liakhovetski wrote:
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@....de>
> Cc: Alan Cox <alan@...ux.intel.com>
> ---
> drivers/tty/serial/sh-sci.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index bf461cf..49e3b2a 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -1579,9 +1579,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 = ¶m->shdma_slave;
passing stuff using chan->private is a dead road, so don't use it.
> return true;
> }
>
> @@ -1620,7 +1620,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);
> @@ -1648,7 +1648,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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists