diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-05-18 20:40:26 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-05-20 14:31:07 -0400 |
commit | 3587aeb067a71b26aa0349daf061572a17e6dcba (patch) | |
tree | 9e27a5f2111c709e3b644c074856258c0cc8fcec /arch/arm/plat-omap/clock.c | |
parent | 2a9f5a4d455aa88a03dac1dca8f686e3c21fc1b2 (diff) |
OMAP clock: resolve old checkpatch and CodingStyle issues with plat-omap/clock.c
Clean up comment style, remove unnecessary includes, and resolve some
checkpatch warnings in plat-omap/clock.c.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/plat-omap/clock.c')
-rw-r--r-- | arch/arm/plat-omap/clock.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 5261a0923691..c9cd98a97abb 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
@@ -12,14 +12,12 @@ | |||
12 | */ | 12 | */ |
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/module.h> | ||
16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
18 | #include <linux/err.h> | 17 | #include <linux/err.h> |
19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
20 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
21 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
22 | #include <linux/platform_device.h> | ||
23 | #include <linux/cpufreq.h> | 21 | #include <linux/cpufreq.h> |
24 | #include <linux/debugfs.h> | 22 | #include <linux/debugfs.h> |
25 | #include <linux/io.h> | 23 | #include <linux/io.h> |
@@ -32,9 +30,9 @@ static DEFINE_SPINLOCK(clockfw_lock); | |||
32 | 30 | ||
33 | static struct clk_functions *arch_clock; | 31 | static struct clk_functions *arch_clock; |
34 | 32 | ||
35 | /*------------------------------------------------------------------------- | 33 | /* |
36 | * Standard clock functions defined in include/linux/clk.h | 34 | * Standard clock functions defined in include/linux/clk.h |
37 | *-------------------------------------------------------------------------*/ | 35 | */ |
38 | 36 | ||
39 | int clk_enable(struct clk *clk) | 37 | int clk_enable(struct clk *clk) |
40 | { | 38 | { |
@@ -92,9 +90,9 @@ unsigned long clk_get_rate(struct clk *clk) | |||
92 | } | 90 | } |
93 | EXPORT_SYMBOL(clk_get_rate); | 91 | EXPORT_SYMBOL(clk_get_rate); |
94 | 92 | ||
95 | /*------------------------------------------------------------------------- | 93 | /* |
96 | * Optional clock functions defined in include/linux/clk.h | 94 | * Optional clock functions defined in include/linux/clk.h |
97 | *-------------------------------------------------------------------------*/ | 95 | */ |
98 | 96 | ||
99 | long clk_round_rate(struct clk *clk, unsigned long rate) | 97 | long clk_round_rate(struct clk *clk, unsigned long rate) |
100 | { | 98 | { |
@@ -140,9 +138,11 @@ int clk_set_parent(struct clk *clk, struct clk *parent) | |||
140 | unsigned long flags; | 138 | unsigned long flags; |
141 | int ret = -EINVAL; | 139 | int ret = -EINVAL; |
142 | 140 | ||
143 | if (cpu_is_omap44xx()) | 141 | if (cpu_is_omap44xx()) { |
144 | /* OMAP4 clk framework not supported yet */ | 142 | WARN(1, "clock: %s: not supported yet on OMAP4\n", __func__); |
145 | return 0; | 143 | return 0; |
144 | } | ||
145 | |||
146 | if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent)) | 146 | if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent)) |
147 | return ret; | 147 | return ret; |
148 | 148 | ||
@@ -169,9 +169,9 @@ struct clk *clk_get_parent(struct clk *clk) | |||
169 | } | 169 | } |
170 | EXPORT_SYMBOL(clk_get_parent); | 170 | EXPORT_SYMBOL(clk_get_parent); |
171 | 171 | ||
172 | /*------------------------------------------------------------------------- | 172 | /* |
173 | * OMAP specific clock functions shared between omap1 and omap2 | 173 | * OMAP specific clock functions shared between omap1 and omap2 |
174 | *-------------------------------------------------------------------------*/ | 174 | */ |
175 | 175 | ||
176 | int __initdata mpurate; | 176 | int __initdata mpurate; |
177 | 177 | ||
@@ -222,7 +222,7 @@ void clk_reparent(struct clk *child, struct clk *parent) | |||
222 | } | 222 | } |
223 | 223 | ||
224 | /* Propagate rate to children */ | 224 | /* Propagate rate to children */ |
225 | void propagate_rate(struct clk * tclk) | 225 | void propagate_rate(struct clk *tclk) |
226 | { | 226 | { |
227 | struct clk *clkp; | 227 | struct clk *clkp; |
228 | 228 | ||
@@ -389,7 +389,9 @@ void clk_exit_cpufreq_table(struct cpufreq_frequency_table **table) | |||
389 | } | 389 | } |
390 | #endif | 390 | #endif |
391 | 391 | ||
392 | /*-------------------------------------------------------------------------*/ | 392 | /* |
393 | * | ||
394 | */ | ||
393 | 395 | ||
394 | #ifdef CONFIG_OMAP_RESET_CLOCKS | 396 | #ifdef CONFIG_OMAP_RESET_CLOCKS |
395 | /* | 397 | /* |
@@ -404,7 +406,7 @@ static int __init clk_disable_unused(void) | |||
404 | if (ck->ops == &clkops_null) | 406 | if (ck->ops == &clkops_null) |
405 | continue; | 407 | continue; |
406 | 408 | ||
407 | if (ck->usecount > 0 || ck->enable_reg == 0) | 409 | if (ck->usecount > 0 || !ck->enable_reg) |
408 | continue; | 410 | continue; |
409 | 411 | ||
410 | spin_lock_irqsave(&clockfw_lock, flags); | 412 | spin_lock_irqsave(&clockfw_lock, flags); |