MLK-14498-4 dma: imx-sdma: remove the redundant clock operation
authorAndy Duan <fugang.duan@nxp.com>
Tue, 21 Mar 2017 06:25:25 +0000 (14:25 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:21:38 +0000 (15:21 -0500)
Remove the redundant clock operation.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
drivers/dma/imx-sdma.c

index a440556..8775bb3 100644 (file)
@@ -1352,8 +1352,12 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
        struct imx_dma_data default_data;
        int prio, ret;
 
-       clk_enable(sdmac->sdma->clk_ipg);
-       clk_enable(sdmac->sdma->clk_ahb);
+       ret = clk_enable(sdmac->sdma->clk_ipg);
+       if (ret)
+               return ret;
+       ret = clk_enable(sdmac->sdma->clk_ahb);
+       if (ret)
+               goto disable_clk_ipg;
 
        /*
         * dmatest(memcpy) will never call slave_config before prep, so we need
@@ -1391,13 +1395,6 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
        sdmac->src_dualfifo = data->src_dualfifo;
        sdmac->dst_dualfifo = data->dst_dualfifo;
 
-       ret = clk_enable(sdmac->sdma->clk_ipg);
-       if (ret)
-               return ret;
-       ret = clk_enable(sdmac->sdma->clk_ahb);
-       if (ret)
-               goto disable_clk_ipg;
-
        ret = sdma_set_channel_priority(sdmac, prio);
        if (ret)
                goto disable_clk_ahb;