lkml.org 
[lkml]   [2016]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 14/24] ste_dma40: One check less in d40_prep_sg() after error detection
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sat, 17 Sep 2016 15:34:07 +0200

    * Adjust jump targets according to the Linux coding style convention.

    * Delete a repeated check which became unnecessary with this refactoring.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/dma/ste_dma40.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
    index 0788add..a7e7cd0 100644
    --- a/drivers/dma/ste_dma40.c
    +++ b/drivers/dma/ste_dma40.c
    @@ -2251,7 +2251,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,

    desc = d40_prep_desc(chan, sg_src, sg_len, dma_flags);
    if (desc == NULL)
    - goto err;
    + goto unlock;

    if (sg_next(&sg_src[sg_len - 1]) == sg_src)
    desc->cyclic = true;
    @@ -2271,7 +2271,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,
    if (ret) {
    chan_err(chan, "Failed to prepare %s sg job: %d\n",
    chan_is_logical(chan) ? "log" : "phy", ret);
    - goto err;
    + goto free_desc;
    }

    /*
    @@ -2283,10 +2283,9 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src,
    spin_unlock_irqrestore(&chan->lock, flags);

    return &desc->txd;
    -
    -err:
    - if (desc)
    - d40_desc_free(chan, desc);
    + free_desc:
    + d40_desc_free(chan, desc);
    + unlock:
    spin_unlock_irqrestore(&chan->lock, flags);
    return NULL;
    }
    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-17 17:24    [W:4.178 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site