lkml.org 
[lkml]   [2012]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/9 v3] ASoC: siu: prepare for conversion to the shdma base library
    Date
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Cc: Liam Girdwood <lrg@ti.com>
    Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
    ---
    sound/soc/sh/siu_pcm.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
    index 5cfcc65..3fdc801 100644
    --- a/sound/soc/sh/siu_pcm.c
    +++ b/sound/soc/sh/siu_pcm.c
    @@ -330,12 +330,12 @@ static bool filter(struct dma_chan *chan, void *slave)
    {
    struct sh_dmae_slave *param = slave;

    - pr_debug("%s: slave ID %d\n", __func__, param->slave_id);
    + pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id);

    if (unlikely(param->dma_dev != chan->device->dev))
    return false;

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

    @@ -360,12 +360,12 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
    if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) {
    siu_stream = &port_info->playback;
    param = &siu_stream->param;
    - param->slave_id = port ? pdata->dma_slave_tx_b :
    + param->shdma_slave.slave_id = port ? pdata->dma_slave_tx_b :
    pdata->dma_slave_tx_a;
    } else {
    siu_stream = &port_info->capture;
    param = &siu_stream->param;
    - param->slave_id = port ? pdata->dma_slave_rx_b :
    + param->shdma_slave.slave_id = port ? pdata->dma_slave_rx_b :
    pdata->dma_slave_rx_a;
    }

    --
    1.7.2.5


    \
     
     \ /
      Last update: 2012-05-09 17:41    [W:0.021 / U:0.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site