redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

clk: timer-sp: convert to clk_prepare()/clk_unprepare()

Browse source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-09-22 11:38:40 +01:00
parent 72ae00c970
commit 6f5ad96301
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/common/timer-sp.c
View file

@ -41,9 +41,17 @@ static long __init sp804_get_clock_rate(const char *name)
return PTR_ERR(clk); return PTR_ERR(clk);
} }
err = clk_prepare(clk);
if (err) {
pr_err("sp804: %s clock failed to prepare: %d\n", name, err);
clk_put(clk);
return err;
}
err = clk_enable(clk); err = clk_enable(clk);
if (err) { if (err) {
pr_err("sp804: %s clock failed to enable: %d\n", name, err); pr_err("sp804: %s clock failed to enable: %d\n", name, err);
clk_unprepare(clk);
clk_put(clk); clk_put(clk);
return err; return err;
} }
@ -52,6 +60,7 @@ static long __init sp804_get_clock_rate(const char *name)
if (rate < 0) { if (rate < 0) {
pr_err("sp804: %s clock failed to get rate: %ld\n", name, rate); pr_err("sp804: %s clock failed to get rate: %ld\n", name, rate);
clk_disable(clk); clk_disable(clk);
clk_unprepare(clk);
clk_put(clk); clk_put(clk);
} }