From: Jeff Mahoney <jeffm@suse.com>
To: Linux Kernel Maling List <linux-kernel@vger.kernel.org>
Cc: Viresh Kumar <viresh.kumar@st.com>,
Wolfram Sang <w.sang@pengutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jeff Garzik <jgarzik@redhat.com>, Andrew Lunn <andrew@lunn.ch>,
Bhupesh Sharma <bhupesh.sharma@st.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Russell King <rmk@arm.linux.org.uk>,
Mike Turquette <mturquette@linaro.org>,
Sergei Shtylyov <sshtylyov@ru.mvista.com>
Subject: [PATCH] clk.h: Fix shim ifdef guard (HAVE_CLK -> COMMON_CLK)
Date: Mon, 27 Aug 2012 11:28:15 -0400 [thread overview]
Message-ID: <503B920F.30509@suse.com> (raw)
Commit 93abe8e4 (clk: add non HAVE_CLK routines) added shims for
the clk code but HAVE_CLK isn't enough. It's possible to have the
clk support but not enable it. We end up with full prototypes for code
that is never built - causing module linking to fail later.
This patch changes the guard to use COMMON_CLK, which actually guards
the code.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
include/linux/clk.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -120,7 +120,7 @@ static inline void clk_unprepare(struct
}
#endif
-#ifdef CONFIG_HAVE_CLK
+#ifdef CONFIG_COMMON_CLK
/**
* clk_get - lookup and obtain a reference to a clock producer.
* @dev: device for clock "consumer"
@@ -276,7 +276,7 @@ struct clk *clk_get_parent(struct clk *c
*/
struct clk *clk_get_sys(const char *dev_id, const char *con_id);
-#else /* !CONFIG_HAVE_CLK */
+#else /* !CONFIG_COMMON_CLK */
static inline struct clk *clk_get(struct device *dev, const char *id)
{
--
Jeff Mahoney
SUSE Labs
next reply other threads:[~2012-08-27 15:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 15:28 Jeff Mahoney [this message]
2012-08-27 18:52 ` [PATCH] clk.h: Fix shim ifdef guard (HAVE_CLK -> COMMON_CLK) Russell King
2012-08-27 20:53 ` Jeff Mahoney
2012-08-28 0:51 ` Russell King
-- strict thread matches above, loose matches on Subject: below --
2012-08-27 15:54 Jeff Mahoney
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=503B920F.30509@suse.com \
--to=jeffm@suse.com \
--cc=andrew@lunn.ch \
--cc=bhupesh.sharma@st.com \
--cc=gregkh@linuxfoundation.org \
--cc=jgarzik@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=peppe.cavallaro@st.com \
--cc=rmk@arm.linux.org.uk \
--cc=sshtylyov@ru.mvista.com \
--cc=viresh.kumar@st.com \
--cc=w.sang@pengutronix.de \
/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