]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
authorShawn Guo <shawn.guo@linaro.org>
Tue, 20 Dec 2011 05:57:41 +0000 (13:57 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Wed, 28 Dec 2011 13:30:06 +0000 (21:30 +0800)
The patch converts mxs-mmc driver to clk_prepare/clk_unprepare by
using helper functions clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Chris Ball <cjb@laptop.org>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
drivers/mmc/host/mxs-mmc.c

index 99b449d26a4d39579c787871ca448e50bed8a37a..973011f9a298ba7ecf9e49d26847d25d5ad99518 100644 (file)
@@ -713,7 +713,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
                ret = PTR_ERR(host->clk);
                goto out_iounmap;
        }
-       clk_enable(host->clk);
+       clk_prepare_enable(host->clk);
 
        mxs_mmc_reset(host);
 
@@ -772,7 +772,7 @@ out_free_dma:
        if (host->dmach)
                dma_release_channel(host->dmach);
 out_clk_put:
-       clk_disable(host->clk);
+       clk_disable_unprepare(host->clk);
        clk_put(host->clk);
 out_iounmap:
        iounmap(host->base);
@@ -798,7 +798,7 @@ static int mxs_mmc_remove(struct platform_device *pdev)
        if (host->dmach)
                dma_release_channel(host->dmach);
 
-       clk_disable(host->clk);
+       clk_disable_unprepare(host->clk);
        clk_put(host->clk);
 
        iounmap(host->base);
@@ -819,7 +819,7 @@ static int mxs_mmc_suspend(struct device *dev)
 
        ret = mmc_suspend_host(mmc);
 
-       clk_disable(host->clk);
+       clk_disable_unprepare(host->clk);
 
        return ret;
 }
@@ -830,7 +830,7 @@ static int mxs_mmc_resume(struct device *dev)
        struct mxs_mmc_host *host = mmc_priv(mmc);
        int ret = 0;
 
-       clk_enable(host->clk);
+       clk_prepare_enable(host->clk);
 
        ret = mmc_resume_host(mmc);