lkml.org 
[lkml]   [2016]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/7] dmaengine: omap-dma: Simplify omap_dma_start_sg parameter list
    Date
    We can drop the (sg)idx parameter for the omap_dma_start_sg() function and
    increment the sgidx inside of the same function.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    ---
    drivers/dma/omap-dma.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
    index 2e0d49bcfd8a..7d56cd88c9a5 100644
    --- a/drivers/dma/omap-dma.c
    +++ b/drivers/dma/omap-dma.c
    @@ -365,10 +365,9 @@ static void omap_dma_stop(struct omap_chan *c)
    c->running = false;
    }

    -static void omap_dma_start_sg(struct omap_chan *c, struct omap_desc *d,
    - unsigned idx)
    +static void omap_dma_start_sg(struct omap_chan *c, struct omap_desc *d)
    {
    - struct omap_sg *sg = d->sg + idx;
    + struct omap_sg *sg = d->sg + c->sgidx;
    unsigned cxsa, cxei, cxfi;

    if (d->dir == DMA_DEV_TO_MEM || d->dir == DMA_MEM_TO_MEM) {
    @@ -388,6 +387,7 @@ static void omap_dma_start_sg(struct omap_chan *c, struct omap_desc *d,
    omap_dma_chan_write(c, CFN, sg->fn);

    omap_dma_start(c, d);
    + c->sgidx++;
    }

    static void omap_dma_start_desc(struct omap_chan *c)
    @@ -433,7 +433,7 @@ static void omap_dma_start_desc(struct omap_chan *c)
    omap_dma_chan_write(c, CSDP, d->csdp);
    omap_dma_chan_write(c, CLNK_CTRL, d->clnk_ctrl);

    - omap_dma_start_sg(c, d, 0);
    + omap_dma_start_sg(c, d);
    }

    static void omap_dma_callback(int ch, u16 status, void *data)
    @@ -446,8 +446,8 @@ static void omap_dma_callback(int ch, u16 status, void *data)
    d = c->desc;
    if (d) {
    if (!c->cyclic) {
    - if (++c->sgidx < d->sglen) {
    - omap_dma_start_sg(c, d, c->sgidx);
    + if (c->sgidx < d->sglen) {
    + omap_dma_start_sg(c, d);
    } else {
    omap_dma_start_desc(c);
    vchan_cookie_complete(&d->vd);
    --
    2.9.1
    \
     
     \ /
      Last update: 2016-07-14 15:21    [W:3.030 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site