Skip to content

Commit b52f491

Browse files
author
Mike Turquette
committed
asm-generic: COMMON_CLK defines __clk_{get,put}
If CONFIG_COMMON_CLK is selected then __clk_get and __clk_put are defined in drivers/clk/clk.c and declared in include/linux/clkdev.h. Sylwester's series[0] to properly support clk_{get,put} in the common clock framework made changes to the asm-specific clkdev.h headers, but not the asm-generic version. Tomeu's recent changes[1] to introduce a provider/consumer split in the clock framework uncovered this problem, causing the following build error on any architecture using the asm-generic clkdev.h (e.g. x86 architecture and the ACPI LPSS driver): In file included from drivers/acpi/acpi_lpss.c:15:0: include/linux/clkdev.h:59:5: error: conflicting types for ‘__clk_get’ int __clk_get(struct clk_core *clk); ^ In file included from arch/x86/include/generated/asm/clkdev.h:1:0, from include/linux/clkdev.h:15, from drivers/acpi/acpi_lpss.c:15: include/asm-generic/clkdev.h:20:19: note: previous definition of ‘__clk_get’ was here static inline int __clk_get(struct clk *clk) { return 1; } ^ Fixed by only declarating __clk_get and __clk_put when CONFIG_COMMON_CLK is set. [0] http://lkml.kernel.org/r/<[email protected]> [1] http://lkml.kernel.org/r/<[email protected]> Signed-off-by: Mike Turquette <[email protected]>
1 parent 59c0621 commit b52f491

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

include/asm-generic/clkdev.h

+2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515

1616
#include <linux/slab.h>
1717

18+
#ifndef CONFIG_COMMON_CLK
1819
struct clk;
1920

2021
static inline int __clk_get(struct clk *clk) { return 1; }
2122
static inline void __clk_put(struct clk *clk) { }
23+
#endif
2224

2325
static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
2426
{

0 commit comments

Comments
 (0)