aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2014-06-30 15:11:06 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-07-09 05:26:12 -0400
commitd222c4c0ce170cd81a74988fd2eb99230519f9ae (patch)
treedb31387de7f84a3769cf5cf9c71328a7e85283ec
parent03a59437ef6b6ad7fb0165cb9b96c08d6bf057fc (diff)
mmc: s3cmci: Move to clk_prepare_enable/clk_disable_unprepare
Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/s3cmci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index f23782683a7c..501ec210780c 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1787,7 +1787,7 @@ static int s3cmci_probe(struct platform_device *pdev)
1787 goto probe_free_dma; 1787 goto probe_free_dma;
1788 } 1788 }
1789 1789
1790 ret = clk_enable(host->clk); 1790 ret = clk_prepare_enable(host->clk);
1791 if (ret) { 1791 if (ret) {
1792 dev_err(&pdev->dev, "failed to enable clock source.\n"); 1792 dev_err(&pdev->dev, "failed to enable clock source.\n");
1793 goto clk_free; 1793 goto clk_free;
@@ -1845,7 +1845,7 @@ static int s3cmci_probe(struct platform_device *pdev)
1845 s3cmci_cpufreq_deregister(host); 1845 s3cmci_cpufreq_deregister(host);
1846 1846
1847 free_dmabuf: 1847 free_dmabuf:
1848 clk_disable(host->clk); 1848 clk_disable_unprepare(host->clk);
1849 1849
1850 clk_free: 1850 clk_free:
1851 clk_put(host->clk); 1851 clk_put(host->clk);
@@ -1897,7 +1897,7 @@ static void s3cmci_shutdown(struct platform_device *pdev)
1897 s3cmci_debugfs_remove(host); 1897 s3cmci_debugfs_remove(host);
1898 s3cmci_cpufreq_deregister(host); 1898 s3cmci_cpufreq_deregister(host);
1899 mmc_remove_host(mmc); 1899 mmc_remove_host(mmc);
1900 clk_disable(host->clk); 1900 clk_disable_unprepare(host->clk);
1901} 1901}
1902 1902
1903static int s3cmci_remove(struct platform_device *pdev) 1903static int s3cmci_remove(struct platform_device *pdev)