diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-10-28 18:49:25 -0400 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2014-01-13 12:48:15 -0500 |
commit | 00fb3d2a19a4e0b910aaebcfce086c3a172d3907 (patch) | |
tree | b47fc74913fc64814c85e4e47c606e0bfab64e77 /drivers/mmc | |
parent | a50145f925c722dd74e18758fe4d9da9eb4c72ed (diff) |
mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sh_mobile_sdhi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index f344659dceac..ed1718a7f5eb 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c | |||
@@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned int | |||
54 | struct mmc_host *mmc = platform_get_drvdata(pdev); | 54 | struct mmc_host *mmc = platform_get_drvdata(pdev); |
55 | struct tmio_mmc_host *host = mmc_priv(mmc); | 55 | struct tmio_mmc_host *host = mmc_priv(mmc); |
56 | struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); | 56 | struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); |
57 | int ret = clk_enable(priv->clk); | 57 | int ret = clk_prepare_enable(priv->clk); |
58 | if (ret < 0) | 58 | if (ret < 0) |
59 | return ret; | 59 | return ret; |
60 | 60 | ||
@@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct platform_device *pdev) | |||
67 | struct mmc_host *mmc = platform_get_drvdata(pdev); | 67 | struct mmc_host *mmc = platform_get_drvdata(pdev); |
68 | struct tmio_mmc_host *host = mmc_priv(mmc); | 68 | struct tmio_mmc_host *host = mmc_priv(mmc); |
69 | struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); | 69 | struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); |
70 | clk_disable(priv->clk); | 70 | clk_disable_unprepare(priv->clk); |
71 | } | 71 | } |
72 | 72 | ||
73 | static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) | 73 | static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) |