From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the clk tree
Date: Tue, 2 Jul 2019 10:01:03 +1000 [thread overview]
Message-ID: <20190702100103.12c132da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]
Hi all,
After merging the clk tree, today's linux-next build (arm omap1_defconfig
and many others) failed like this:
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
Caused by commit
59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
This commit exposed the CONFIG_COMMON_CLK version of the __clk_get_hw()
declaration to non CONFIG_COMMON_CLK code (where there is a static
declaration of __clk_get_hw() (which is BTW missing an "inline")
in drivers/clk/clk.h.
We need something like this (untested):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jul 2019 09:58:18 +1000
Subject: [PATCH] clk: for up for "clk: Remove ifdef for COMMON_CLK in
clk-provider.h"
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
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/clk/clk.h | 2 +-
include/linux/clk-provider.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h
index d8400d623b34..143acac2ec81 100644
--- a/drivers/clk/clk.h
+++ b/drivers/clk/clk.h
@@ -33,7 +33,7 @@ clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id,
{
return (struct clk *)hw;
}
-static struct clk_hw *__clk_get_hw(struct clk *clk)
+static inline struct clk_hw *__clk_get_hw(struct clk *clk)
{
return (struct clk_hw *)clk;
}
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 0fbf3ccad849..35c8b1c315b4 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -805,7 +805,10 @@ 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_COMON_CLK
+/* There is a !CONFIG_COMMON_CLK static inline for this in drivers/clk/clk.h */
struct clk_hw *__clk_get_hw(struct clk *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,
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-07-02 0:01 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-02 0:01 Stephen Rothwell [this message]
2019-07-02 1:14 ` linux-next: build failure after merge of the clk tree Stephen Rothwell
2019-07-02 2:03 ` Stephen Rothwell
2019-07-05 1:24 ` Stephen Rothwell
2019-07-12 17:53 ` Stephen Boyd
-- strict thread matches above, loose matches on Subject: below --
2024-01-03 23:04 Stephen Rothwell
2024-01-04 0:59 ` Stephen Boyd
2023-04-02 23:59 Stephen Rothwell
2023-04-05 0:28 ` Stephen Rothwell
2020-05-11 0:55 Stephen Rothwell
2020-05-13 3:20 ` Stephen Boyd
2020-05-13 3:28 ` Stephen Boyd
2020-01-07 21:47 Stephen Rothwell
2019-05-02 23:25 Stephen Rothwell
2019-05-03 15:55 ` Stephen Boyd
2018-11-29 22:03 Stephen Rothwell
2018-01-01 21:51 Stephen Rothwell
2018-01-02 19:58 ` Stephen Boyd
2017-12-10 23:16 Stephen Rothwell
2017-12-14 0:57 ` Stephen Boyd
2017-06-05 0:14 Stephen Rothwell
2015-08-12 7:19 Stephen Rothwell
2015-08-12 7:45 ` Geert Uytterhoeven
2015-08-12 8:23 ` Stephen Boyd
2015-08-12 8:03 ` Stephen Boyd
2015-07-27 4:11 Stephen Rothwell
2015-08-03 10:08 ` Tony Lindgren
2015-08-07 23:56 ` Stephen Boyd
2015-08-13 11:04 ` Olof Johansson
2015-02-27 3:08 Stephen Rothwell
2015-02-27 17:42 ` Stephen Boyd
2015-03-04 9:56 ` Geert Uytterhoeven
2015-03-05 0:15 ` Mike Turquette
2015-02-26 2:14 Stephen Rothwell
2015-02-26 9:09 ` Krzysztof Kozlowski
2015-02-27 0:01 ` Mike Turquette
2015-02-27 0:06 ` Stephen Rothwell
2014-12-16 3:45 Stephen Rothwell
[not found] ` <20141216072034.29014.12434@quantum>
2014-12-17 3:47 ` Stephen Rothwell
2014-01-29 3:32 Stephen Rothwell
2014-01-29 10:02 ` Sebastian Hesselbarth
2013-04-15 5:04 Stephen Rothwell
2013-04-15 7:03 ` Sebastian Hesselbarth
2013-04-16 0:42 ` Mike Turquette
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=20190702100103.12c132da@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).