diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-12-20 00:57:41 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2011-12-28 08:30:06 -0500 |
commit | efdfc52c0470fb650cb2ee44cf030ec04e97b954 (patch) | |
tree | 3d31b013a7b4c0fbe01dcf6e103f989505db2e10 /drivers/mmc | |
parent | 759a2e30d288032130f1f77092e72d4ec87ad4d0 (diff) |
mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 99b449d26a4d..973011f9a298 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c | |||
@@ -713,7 +713,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) | |||
713 | ret = PTR_ERR(host->clk); | 713 | ret = PTR_ERR(host->clk); |
714 | goto out_iounmap; | 714 | goto out_iounmap; |
715 | } | 715 | } |
716 | clk_enable(host->clk); | 716 | clk_prepare_enable(host->clk); |
717 | 717 | ||
718 | mxs_mmc_reset(host); | 718 | mxs_mmc_reset(host); |
719 | 719 | ||
@@ -772,7 +772,7 @@ out_free_dma: | |||
772 | if (host->dmach) | 772 | if (host->dmach) |
773 | dma_release_channel(host->dmach); | 773 | dma_release_channel(host->dmach); |
774 | out_clk_put: | 774 | out_clk_put: |
775 | clk_disable(host->clk); | 775 | clk_disable_unprepare(host->clk); |
776 | clk_put(host->clk); | 776 | clk_put(host->clk); |
777 | out_iounmap: | 777 | out_iounmap: |
778 | iounmap(host->base); | 778 | iounmap(host->base); |
@@ -798,7 +798,7 @@ static int mxs_mmc_remove(struct platform_device *pdev) | |||
798 | if (host->dmach) | 798 | if (host->dmach) |
799 | dma_release_channel(host->dmach); | 799 | dma_release_channel(host->dmach); |
800 | 800 | ||
801 | clk_disable(host->clk); | 801 | clk_disable_unprepare(host->clk); |
802 | clk_put(host->clk); | 802 | clk_put(host->clk); |
803 | 803 | ||
804 | iounmap(host->base); | 804 | iounmap(host->base); |
@@ -819,7 +819,7 @@ static int mxs_mmc_suspend(struct device *dev) | |||
819 | 819 | ||
820 | ret = mmc_suspend_host(mmc); | 820 | ret = mmc_suspend_host(mmc); |
821 | 821 | ||
822 | clk_disable(host->clk); | 822 | clk_disable_unprepare(host->clk); |
823 | 823 | ||
824 | return ret; | 824 | return ret; |
825 | } | 825 | } |
@@ -830,7 +830,7 @@ static int mxs_mmc_resume(struct device *dev) | |||
830 | struct mxs_mmc_host *host = mmc_priv(mmc); | 830 | struct mxs_mmc_host *host = mmc_priv(mmc); |
831 | int ret = 0; | 831 | int ret = 0; |
832 | 832 | ||
833 | clk_enable(host->clk); | 833 | clk_prepare_enable(host->clk); |
834 | 834 | ||
835 | ret = mmc_resume_host(mmc); | 835 | ret = mmc_resume_host(mmc); |
836 | 836 | ||