[PATCH 06/29] hwrng: omap: use clk_prepare_enable and clk_disable_unprepare
From: Rajendra Nayak <hidden>
Date: 2012-06-14 12:46:55
Also in:
linux-omap
Subsystem:
hardware random number generator core, omap random number generator support, the rest · Maintainers:
Olivia Mackall, Herbert Xu, Deepak Saxena, Linus Torvalds
As we move to Common clk framework use clk_prepare_enable() instead of clk_enable() and similarly clk_disable_unprepare() instead of clk_disable() Signed-off-by: Rajendra Nayak <redacted> Cc: Deepak Saxena <dsaxena@plexity.net> Cc: Matt Mackall <redacted> --- drivers/char/hw_random/omap-rng.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 1412565..500604a 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c@@ -110,7 +110,7 @@ static int __devinit omap_rng_probe(struct platform_device *pdev) ret = PTR_ERR(rng_ick); return ret; } else - clk_enable(rng_ick); + clk_prepare_enable(rng_ick); } res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -138,7 +138,7 @@ err_register: rng_base = NULL; err_ioremap: if (cpu_is_omap24xx()) { - clk_disable(rng_ick); + clk_disable_unprepare(rng_ick); clk_put(rng_ick); } return ret;
@@ -151,7 +151,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev) omap_rng_write_reg(RNG_MASK_REG, 0x0); if (cpu_is_omap24xx()) { - clk_disable(rng_ick); + clk_disable_unprepare(rng_ick); clk_put(rng_ick); }
--
1.7.1