dma/imx-sdma: let sdma_run_channel call sdma_enable_channel
authorRichard Zhao <richard.zhao@linaro.org>
Fri, 13 Jan 2012 03:09:56 +0000 (11:09 +0800)
committerVinod Koul <vinod.koul@linux.intel.com>
Tue, 31 Jan 2012 03:33:16 +0000 (09:03 +0530)
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>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
drivers/dma/imx-sdma.c

index e58dbf638cc9463367870bd98095c0f5df48eb24..46e334d48e8d90eeda5a5a8729007f99b58e4006 100644 (file)
@@ -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;