aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk.c
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@ti.com>2012-11-26 14:20:09 -0500
committerMichael Turquette <mturquette@deferred.io>2013-01-11 19:32:41 -0500
commit65800b2c4012e11f1c33692e6727e743a05c6efe (patch)
tree26878ce4855a70ffd868bca929f21c01ee4d37f7 /drivers/clk/clk.c
parent9931faca02c604c22335f5a935a501bb2ace6e20 (diff)
clk: Don't mark shared helper functions as inline
The helper functions that access the opaque struct clk should not be marked inline since they are contained in clk.c, but expected to be used by other compilation units. This causes compile errors under gcc-4.7 In file included from arch/arm/mach-omap2/clockdomain.c:25:0: arch/arm/mach-omap2/clockdomain.c: In function ‘clkdm_clk_disable’: include/linux/clk-provider.h:338:12: error: inlining failed in call to always_inline ‘__clk_get_enable_count’: function body not available arch/arm/mach-omap2/clockdomain.c:1001:28: error: called from here make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by: Russ Dill <Russ.Dill@ti.com> Signed-off-by: Mike Turquette <mturquette@linaro.org> [mturquette@linaro.org: removed fixes made redundant by commit 93532c8a] [mturquette@linaro.org: improved $SUBJECT]
Diffstat (limited to 'drivers/clk/clk.c')
-rw-r--r--drivers/clk/clk.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 251e45d6024d..9777466b81b9 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -259,32 +259,32 @@ late_initcall(clk_disable_unused);
259 259
260/*** helper functions ***/ 260/*** helper functions ***/
261 261
262inline const char *__clk_get_name(struct clk *clk) 262const char *__clk_get_name(struct clk *clk)
263{ 263{
264 return !clk ? NULL : clk->name; 264 return !clk ? NULL : clk->name;
265} 265}
266 266
267inline struct clk_hw *__clk_get_hw(struct clk *clk) 267struct clk_hw *__clk_get_hw(struct clk *clk)
268{ 268{
269 return !clk ? NULL : clk->hw; 269 return !clk ? NULL : clk->hw;
270} 270}
271 271
272inline u8 __clk_get_num_parents(struct clk *clk) 272u8 __clk_get_num_parents(struct clk *clk)
273{ 273{
274 return !clk ? 0 : clk->num_parents; 274 return !clk ? 0 : clk->num_parents;
275} 275}
276 276
277inline struct clk *__clk_get_parent(struct clk *clk) 277struct clk *__clk_get_parent(struct clk *clk)
278{ 278{
279 return !clk ? NULL : clk->parent; 279 return !clk ? NULL : clk->parent;
280} 280}
281 281
282inline unsigned int __clk_get_enable_count(struct clk *clk) 282unsigned int __clk_get_enable_count(struct clk *clk)
283{ 283{
284 return !clk ? 0 : clk->enable_count; 284 return !clk ? 0 : clk->enable_count;
285} 285}
286 286
287inline unsigned int __clk_get_prepare_count(struct clk *clk) 287unsigned int __clk_get_prepare_count(struct clk *clk)
288{ 288{
289 return !clk ? 0 : clk->prepare_count; 289 return !clk ? 0 : clk->prepare_count;
290} 290}
@@ -310,7 +310,7 @@ out:
310 return ret; 310 return ret;
311} 311}
312 312
313inline unsigned long __clk_get_flags(struct clk *clk) 313unsigned long __clk_get_flags(struct clk *clk)
314{ 314{
315 return !clk ? 0 : clk->flags; 315 return !clk ? 0 : clk->flags;
316} 316}