rtc: hym8563: include clkout code only if COMMON_CLK active
PATCH 1/1 rtc: hym8563: include clkout code only if COMMON_CLK active
The contents of clk-provide.h, struct clk_hw etc, are only available if CONFIG_COMMON_CLK is selected. Therefore IS_ENABLED(COMMON_CLK) is not sufficient and real preprocessor conditions are necessary to keep the code in question from being compiled on non-COMMON_CLK systems.
Signed-off-by Heiko Stuebner <[email protected]>
--- drivers/rtc/rtc-hym8563.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/rtc/rtc-hym8563.c +7 -2
@@ -87,7 +87,9 @@ struct hym8563 {struct i2c_client *client;struct rtc_device *rtc;bool valid; +#ifdef CONFIG_COMMON_CLK struct clk_hw clkout_hw; +#endif };/*
@@ -290,6 +292,7 @@ static const struct rtc_class_ops hym8563_rtc_ops = {* Handling of the clkout */ +#ifdef CONFIG_COMMON_CLK #define clkout_hw_to_hym8563 (_hw) container_of(_hw, struct hym8563, clkout_hw) static int clkout_rates[] = {
@@ -423,6 +426,7 @@ static struct clk *hym8563_clkout_register_clk(struct hym8563 *hym8563) return clk; } +#endif /* * The alarm interrupt is implemented as a level-low interrupt in the
@@ -565,8 +569,9 @@ static int hym8563_probe(struct i2c_client *client,if (IS_ERR (hym8563->rtc))return PTR_ERR (hym8563->rtc); -if (IS_ENABLED (CONFIG_COMMON_CLK )) -hym8563_clkout_register_clk (hym8563); +#ifdef CONFIG_COMMON_CLK +hym8563_clkout_register_clk (hym8563); +#endif return 0 ; }
Signature · 1 line
1.7.10.4
Hi Heiko,
Quoted 7 lines · On Tue, 17 Dec 2013 16:11:30 +0100 Heiko Stübner <[email protected]> wrote:
The contents of
clk-provide.h, structclk_hwetc, are only available ifCONFIG_COMMON_CLKis selected. ThereforeIS_ENABLED(COMMON_CLK)is not sufficient and real preprocessor conditions are necessary to keep the code in question from being compiled on non-COMMON_CLK systems.Signed-off-by Heiko Stuebner <[email protected]>
I will add this to the akpm-current merge today (unless Andrew beats me to it).
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]