lkml.org 
[lkml]   [2018]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 14/17] dmaengine: dma-jz4780: Use dma_set_residue()
    Date
    From: Daniel Silsby <dansilsby@gmail.com>

    This is the standard method provided by dmaengine header.

    Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
    Tested-by: Mathieu Malaterre <malat@debian.org>
    ---
    drivers/dma/dma-jz4780.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    v2: No change

    diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
    index b9db539a5b34..ea17886031fa 100644
    --- a/drivers/dma/dma-jz4780.c
    +++ b/drivers/dma/dma-jz4780.c
    @@ -637,6 +637,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan,
    struct virt_dma_desc *vdesc;
    enum dma_status status;
    unsigned long flags;
    + unsigned long residue = 0;

    status = dma_cookie_status(chan, cookie, txstate);
    if ((status == DMA_COMPLETE) || (txstate == NULL))
    @@ -647,13 +648,13 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan,
    vdesc = vchan_find_desc(&jzchan->vchan, cookie);
    if (vdesc) {
    /* On the issued list, so hasn't been processed yet */
    - txstate->residue = jz4780_dma_desc_residue(jzchan,
    + residue = jz4780_dma_desc_residue(jzchan,
    to_jz4780_dma_desc(vdesc), 0);
    } else if (cookie == jzchan->desc->vdesc.tx.cookie) {
    - txstate->residue = jz4780_dma_desc_residue(jzchan, jzchan->desc,
    + residue = jz4780_dma_desc_residue(jzchan, jzchan->desc,
    jzchan->curr_hwdesc + 1);
    - } else
    - txstate->residue = 0;
    + }
    + dma_set_residue(txstate, residue);

    if (vdesc && jzchan->desc && vdesc == &jzchan->desc->vdesc
    && jzchan->desc->status & (JZ_DMA_DCS_AR | JZ_DMA_DCS_HLT))
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-07-18 20:21    [W:2.787 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site