From: Sibi Sankar <quic_sibis@quicinc.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Rob Herring <robh@kernel.org>, Andy Gross <agross@kernel.org>
Cc: Abel Vesa <abel.vesa@linaro.org>,
Bjorn Andersson <andersson@kernel.org>,
Rajendra Nayak <quic_rjendra@quicinc.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the devicetree tree
Date: Tue, 12 Dec 2023 14:34:26 +0530 [thread overview]
Message-ID: <02305d95-0d74-2dc1-e7f0-c81e15da0896@quicinc.com> (raw)
In-Reply-To: <20231211160510.0aef871b@canb.auug.org.au>
On 12/11/23 10:35, Stephen Rothwell wrote:
> Hi all,
Hey Stephen,
Thanks for the fix.
>
> After merging the devicetree tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/clk/qcom/gcc-x1e80100.c:6786:15: error: variable 'gcc_x1e80100_driver' has initializer but incomplete type
> 6786 | static struct platform_driver gcc_x1e80100_driver = {
> | ^~~~~~~~~~~~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6787:10: error: 'struct platform_driver' has no member named 'probe'
> 6787 | .probe = gcc_x1e80100_probe,
> | ^~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6787:18: warning: excess elements in struct initializer
> 6787 | .probe = gcc_x1e80100_probe,
> | ^~~~~~~~~~~~~~~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6787:18: note: (near initialization for 'gcc_x1e80100_driver')
> drivers/clk/qcom/gcc-x1e80100.c:6788:10: error: 'struct platform_driver' has no member named 'driver'
> 6788 | .driver = {
> | ^~~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6788:19: error: extra brace group at end of initializer
> 6788 | .driver = {
> | ^
> drivers/clk/qcom/gcc-x1e80100.c:6788:19: note: (near initialization for 'gcc_x1e80100_driver')
> drivers/clk/qcom/gcc-x1e80100.c:6788:19: warning: excess elements in struct initializer
> drivers/clk/qcom/gcc-x1e80100.c:6788:19: note: (near initialization for 'gcc_x1e80100_driver')
> drivers/clk/qcom/gcc-x1e80100.c: In function 'gcc_x1e80100_init':
> drivers/clk/qcom/gcc-x1e80100.c:6796:16: error: implicit declaration of function 'platform_driver_register' [-Werror=implicit-function-declaration]
> 6796 | return platform_driver_register(&gcc_x1e80100_driver);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/clk/qcom/gcc-x1e80100.c: In function 'gcc_x1e80100_exit':
> drivers/clk/qcom/gcc-x1e80100.c:6802:9: error: implicit declaration of function 'platform_driver_unregister'; did you mean 'driver_unregister'? [-Werror=implicit-function-declaration]
> 6802 | platform_driver_unregister(&gcc_x1e80100_driver);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> | driver_unregister
> drivers/clk/qcom/gcc-x1e80100.c: At top level:
> drivers/clk/qcom/gcc-x1e80100.c:6786:31: error: storage size of 'gcc_x1e80100_driver' isn't known
> 6786 | static struct platform_driver gcc_x1e80100_driver = {
> | ^~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 0d18bcdebb2f ("of: Stop circularly including of_device.h and of_platform.h")
>
> interacting with commit
>
> 161b7c401f4b ("clk: qcom: Add Global Clock controller (GCC) driver for X1E80100")
>
> from the qcom tree.
>
> I have applied the following merge resolution patch. This patch could
> be applied to the gcom tree.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 Dec 2023 15:47:55 +1100
> Subject: [PATCH] fix up for "of: Stop circularly including of_device.h and of_platform.h"
>
> interacting with
> "clk: qcom: Add Global Clock controller (GCC) driver for X1E80100"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Sibi Sankar <quic_sibis@quicinc.com>
> ---
> drivers/clk/qcom/gcc-x1e80100.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/qcom/gcc-x1e80100.c b/drivers/clk/qcom/gcc-x1e80100.c
> index 74db7fef237b..d7182d6e9783 100644
> --- a/drivers/clk/qcom/gcc-x1e80100.c
> +++ b/drivers/clk/qcom/gcc-x1e80100.c
> @@ -4,8 +4,9 @@
> */
>
> #include <linux/clk-provider.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> #include <linux/regmap.h>
>
> #include <dt-bindings/clock/qcom,x1e80100-gcc.h>
next prev parent reply other threads:[~2023-12-12 9:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 5:05 linux-next: build failure after merge of the devicetree tree Stephen Rothwell
2023-12-12 9:04 ` Sibi Sankar [this message]
2024-01-19 0:58 ` Stephen Rothwell
2024-01-19 14:07 ` Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2023-12-08 2:51 Stephen Rothwell
2023-12-08 7:34 ` Krzysztof Kozlowski
2023-12-07 1:57 Stephen Rothwell
2023-12-07 15:11 ` Rob Herring
2023-12-07 20:58 ` Stephen Rothwell
2023-12-07 22:05 ` Rob Herring
2023-12-08 3:11 ` Stephen Rothwell
2023-04-11 2:28 Stephen Rothwell
2014-05-26 5:05 Stephen Rothwell
2014-05-26 7:22 ` Thomas Petazzoni
2011-10-05 5:24 Stephen Rothwell
2011-10-05 5:54 ` Grant Likely
2010-07-30 3:57 Stephen Rothwell
2010-07-30 6:11 ` Grant Likely
2010-07-15 2:15 Stephen Rothwell
2010-07-15 6:06 ` Grant Likely
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=02305d95-0d74-2dc1-e7f0-c81e15da0896@quicinc.com \
--to=quic_sibis@quicinc.com \
--cc=abel.vesa@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=quic_rjendra@quicinc.com \
--cc=robh@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).