Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / dma / mxs-dma.c

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 493af2f..b06cd4c 100644 (file)
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -311,7 +311,7 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
                        goto err_irq;
        }
 
-       ret = clk_enable(mxs_dma->clk);
+       ret = clk_prepare_enable(mxs_dma->clk);
        if (ret)
                goto err_clk;
 
@@ -346,7 +346,7 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan)
        dma_free_coherent(mxs_dma->dma_device.dev, PAGE_SIZE,
                        mxs_chan->ccw, mxs_chan->ccw_phys);
 
-       clk_disable(mxs_dma->clk);
+       clk_disable_unprepare(mxs_dma->clk);
 }
 
 static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
@@ -554,7 +554,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
 {
        int ret;
 
-       ret = clk_enable(mxs_dma->clk);
+       ret = clk_prepare_enable(mxs_dma->clk);
        if (ret)
                return ret;
 
@@ -581,7 +581,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
                mxs_dma->base + HW_APBHX_CTRL1 + MXS_SET_ADDR);
 
 err_out:
-       clk_disable(mxs_dma->clk);
+       clk_disable_unprepare(mxs_dma->clk);
        return ret;
 }