From: "Heiko Stübner" <heiko@sntech.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com
Subject: [PATCH] rtc: hym8563: include clkout code only if COMMON_CLK active
Date: Tue, 17 Dec 2013 16:11:30 +0100 [thread overview]
Message-ID: <201312171611.30526.heiko@sntech.de> (raw)
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 <heiko@sntech.de>
---
drivers/rtc/rtc-hym8563.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c
index 841392c..b56e3d3 100644
--- a/drivers/rtc/rtc-hym8563.c
+++ b/drivers/rtc/rtc-hym8563.c
@@ -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;
}
--
1.7.10.4
next reply other threads:[~2013-12-17 15:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 15:11 Heiko Stübner [this message]
2013-12-17 22:28 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201312171611.30526.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®