lkml.org 
[lkml]   [2012]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/7] serial: sh-sci: prepare for conversion to simple DMA
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    ---
    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 aff9d61..2a8ffda 100644
    --- a/drivers/tty/serial/sh-sci.c
    +++ b/drivers/tty/serial/sh-sci.c
    @@ -1463,9 +1463,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->simple_slave.slave_id);

    - chan->private = param;
    + chan->private = &param->simple_slave;
    return true;
    }

    @@ -1504,7 +1504,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->simple_slave.slave_id = s->cfg->dma_slave_tx;

    s->cookie_tx = -EINVAL;
    chan = dma_request_channel(mask, filter, param);
    @@ -1532,7 +1532,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->simple_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);
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2012-01-18 11:25    [W:0.020 / U:29.900 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site