* [PATCH] s3cmci: Move to clk_prepare_enable/clk_disable_unprepare
@ 2014-06-30 19:11 Vasily Khoruzhick
2014-07-08 12:33 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Vasily Khoruzhick @ 2014-06-30 19:11 UTC (permalink / raw)
To: Ben Dooks, Chris Ball, Ulf Hansson, linux-arm-kernel, linux-mmc
Cc: Vasily Khoruzhick
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>
---
drivers/mmc/host/s3cmci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 0d115a8..e5516a2 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1707,7 +1707,7 @@ static int s3cmci_probe(struct platform_device *pdev)
goto probe_free_dma;
}
- ret = clk_enable(host->clk);
+ ret = clk_prepare_enable(host->clk);
if (ret) {
dev_err(&pdev->dev, "failed to enable clock source.\n");
goto clk_free;
@@ -1765,7 +1765,7 @@ static int s3cmci_probe(struct platform_device *pdev)
s3cmci_cpufreq_deregister(host);
free_dmabuf:
- clk_disable(host->clk);
+ clk_disable_unprepare(host->clk);
clk_free:
clk_put(host->clk);
@@ -1817,7 +1817,7 @@ static void s3cmci_shutdown(struct platform_device *pdev)
s3cmci_debugfs_remove(host);
s3cmci_cpufreq_deregister(host);
mmc_remove_host(mmc);
- clk_disable(host->clk);
+ clk_disable_unprepare(host->clk);
}
static int s3cmci_remove(struct platform_device *pdev)
--
2.0.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s3cmci: Move to clk_prepare_enable/clk_disable_unprepare
2014-06-30 19:11 [PATCH] s3cmci: Move to clk_prepare_enable/clk_disable_unprepare Vasily Khoruzhick
@ 2014-07-08 12:33 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2014-07-08 12:33 UTC (permalink / raw)
To: Vasily Khoruzhick
Cc: Ben Dooks, Chris Ball, linux-arm-kernel@lists.infradead.org,
linux-mmc
On 30 June 2014 21:11, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> 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>
Thanks! Applied for next.
I took the liberty to add the prefix "mmc" to heading of the commit msg.
Kind regards
Uffe
> ---
> drivers/mmc/host/s3cmci.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
> index 0d115a8..e5516a2 100644
> --- a/drivers/mmc/host/s3cmci.c
> +++ b/drivers/mmc/host/s3cmci.c
> @@ -1707,7 +1707,7 @@ static int s3cmci_probe(struct platform_device *pdev)
> goto probe_free_dma;
> }
>
> - ret = clk_enable(host->clk);
> + ret = clk_prepare_enable(host->clk);
> if (ret) {
> dev_err(&pdev->dev, "failed to enable clock source.\n");
> goto clk_free;
> @@ -1765,7 +1765,7 @@ static int s3cmci_probe(struct platform_device *pdev)
> s3cmci_cpufreq_deregister(host);
>
> free_dmabuf:
> - clk_disable(host->clk);
> + clk_disable_unprepare(host->clk);
>
> clk_free:
> clk_put(host->clk);
> @@ -1817,7 +1817,7 @@ static void s3cmci_shutdown(struct platform_device *pdev)
> s3cmci_debugfs_remove(host);
> s3cmci_cpufreq_deregister(host);
> mmc_remove_host(mmc);
> - clk_disable(host->clk);
> + clk_disable_unprepare(host->clk);
> }
>
> static int s3cmci_remove(struct platform_device *pdev)
> --
> 2.0.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-08 12:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-30 19:11 [PATCH] s3cmci: Move to clk_prepare_enable/clk_disable_unprepare Vasily Khoruzhick
2014-07-08 12:33 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).