lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 11/13] dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
    Date
    Since this function is always used with 'desc' as first argument
    and 'desc->sg' as second argument, the latter is clearly redundant
    and can be removed.

    Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
    ---
    drivers/dma/imx-dma.c | 9 +++++----
    1 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
    index 0b831a7..7b67371 100644
    --- a/drivers/dma/imx-dma.c
    +++ b/drivers/dma/imx-dma.c
    @@ -204,9 +204,10 @@ static int imxdma_hw_chain(struct imxdma_channel *imxdmac)
    /*
    * imxdma_sg_next - prepare next chunk for scatter-gather DMA emulation
    */
    -static inline int imxdma_sg_next(struct imxdma_desc *d, struct scatterlist *sg)
    +static inline int imxdma_sg_next(struct imxdma_desc *d)
    {
    struct imxdma_channel *imxdmac = to_imxdma_chan(d->desc.chan);
    + struct scatterlist *sg = d->sg;
    unsigned long now;

    now = min(d->len, sg->length);
    @@ -249,7 +250,7 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
    d->sg = sg_next(d->sg);
    if (d->sg) {
    u32 tmp;
    - imxdma_sg_next(d, d->sg);
    + imxdma_sg_next(d);
    tmp = imx_dmav1_readl(DMA_CCR(channel));
    imx_dmav1_writel(tmp | CCR_RPT | CCR_ACRPT,
    DMA_CCR(channel));
    @@ -363,7 +364,7 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
    desc->sg = sg_next(desc->sg);

    if (desc->sg) {
    - imxdma_sg_next(desc, desc->sg);
    + imxdma_sg_next(desc);

    tmp = imx_dmav1_readl(DMA_CCR(chno));

    @@ -473,7 +474,7 @@ static int imxdma_xfer_desc(struct imxdma_desc *d)
    return -EINVAL;
    }

    - imxdma_sg_next(d, d->sg);
    + imxdma_sg_next(d);

    break;
    default:
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-03-09 16:23    [W:4.230 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site