diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-07-02 05:03:50 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-07-12 21:00:14 +0300 |
| commit | 1df379924304b687263942452836db1d725155df (patch) | |
| tree | 775fa5811171d6c54fd142e7aec445f00cd7a16d /include | |
| parent | 30d5a945743cd05ec5c847f2e38c2fbda5e00944 (diff) | |
| download | linux-1df379924304b687263942452836db1d725155df.tar.xz | |
clk: consoldiate the __clk_get_hw() declarations
Without this we were getting errors like:
In file included from drivers/clk/clkdev.c:22:0:
drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here
Fixes: 59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
fixes: 73e0e496afda ("clkdev: Always allocate a struct clk and call __clk_get() w/ CCF")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk-provider.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 9ba000e3a50d..55d48140b0d0 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -805,7 +805,14 @@ void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw); /* helper functions */ const char *__clk_get_name(const struct clk *clk); const char *clk_hw_get_name(const struct clk_hw *hw); +#ifdef CONFIG_COMMON_CLK struct clk_hw *__clk_get_hw(struct clk *clk); +#else +static inline struct clk_hw *__clk_get_hw(struct clk *clk) +{ + return (struct clk_hw *)clk; +} +#endif unsigned int clk_hw_get_num_parents(const struct clk_hw *hw); struct clk_hw *clk_hw_get_parent(const struct clk_hw *hw); struct clk_hw *clk_hw_get_parent_by_index(const struct clk_hw *hw, |