lkml.org 
[lkml]   [2012]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 1/2] dma/imx-sdma: let sdma_run_channel call sdma_enable_channel
    Date
    Let all enable channel code call sdma_enable_channel.

    Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    ---
    drivers/dma/imx-sdma.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
    index f59fd8f..c2bc4f1 100644
    --- a/drivers/dma/imx-sdma.c
    +++ b/drivers/dma/imx-sdma.c
    @@ -394,6 +394,11 @@ static int sdma_config_ownership(struct sdma_channel *sdmac,
    return 0;
    }

    +static void sdma_enable_channel(struct sdma_engine *sdma, int channel)
    +{
    + __raw_writel(1 << channel, sdma->regs + SDMA_H_START);
    +}
    +
    /*
    * sdma_run_channel - run a channel and wait till it's done
    */
    @@ -405,7 +410,7 @@ static int sdma_run_channel(struct sdma_channel *sdmac)

    init_completion(&sdmac->done);

    - __raw_writel(1 << channel, sdma->regs + SDMA_H_START);
    + sdma_enable_channel(sdma, channel);

    ret = wait_for_completion_timeout(&sdmac->done, HZ);

    @@ -811,11 +816,6 @@ out:
    return ret;
    }

    -static void sdma_enable_channel(struct sdma_engine *sdma, int channel)
    -{
    - __raw_writel(1 << channel, sdma->regs + SDMA_H_START);
    -}
    -
    static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdmac)
    {
    dma_cookie_t cookie = sdmac->chan.cookie;
    --
    1.7.5.4



    \
     
     \ /
      Last update: 2012-01-08 15:47    [W:0.023 / U:31.364 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site