Received-SPF: pass (google.com: domain of linux-kernel+bounces-30668-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 19 Jan 2024 11:58:43 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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>, Sibi
 Sankar <quic_sibis@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
Message-ID: <20240119115843.5556189a@canb.auug.org.au>
In-Reply-To: <20231211160510.0aef871b@canb.auug.org.au>
References: <20231211160510.0aef871b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S/UQqlq2sNIGyL.SIsfvLS4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/S/UQqlq2sNIGyL.SIsfvLS4
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 11 Dec 2023 16:05:10 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the devicetree tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>=20
> drivers/clk/qcom/gcc-x1e80100.c:6786:15: error: variable 'gcc_x1e80100_dr=
iver' has initializer but incomplete type
>  6786 | static struct platform_driver gcc_x1e80100_driver =3D {
>       |               ^~~~~~~~~~~~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6787:10: error: 'struct platform_driver' =
has no member named 'probe'
>  6787 |         .probe =3D gcc_x1e80100_probe,
>       |          ^~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6787:18: warning: excess elements in stru=
ct initializer
>  6787 |         .probe =3D 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 =3D {
>       |          ^~~~~~
> drivers/clk/qcom/gcc-x1e80100.c:6788:19: error: extra brace group at end =
of initializer
>  6788 |         .driver =3D {
>       |                   ^
> 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 stru=
ct 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 f=
unction 'platform_driver_register' [-Werror=3Dimplicit-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 fu=
nction 'platform_driver_unregister'; did you mean 'driver_unregister'? [-We=
rror=3Dimplicit-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_x1e8=
0100_driver' isn't known
>  6786 | static struct platform_driver gcc_x1e80100_driver =3D {
>       |                               ^~~~~~~~~~~~~~~~~~~
>=20
> Caused by commit
>=20
>   0d18bcdebb2f ("of: Stop circularly including of_device.h and of_platfor=
m.h")
>=20
> interacting with commit
>=20
>   161b7c401f4b ("clk: qcom: Add Global Clock controller (GCC) driver for =
X1E80100")
>=20
> from the qcom tree.
>=20
> I have applied the following merge resolution patch.  This patch could
> be applied to the gcom tree.
>=20
> 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 an=
d of_platform.h"
>=20
> interacting with
> "clk: qcom: Add Global Clock controller (GCC) driver for X1E80100"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/clk/qcom/gcc-x1e80100.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>=20
> diff --git a/drivers/clk/qcom/gcc-x1e80100.c b/drivers/clk/qcom/gcc-x1e80=
100.c
> index 74db7fef237b..d7182d6e9783 100644
> --- a/drivers/clk/qcom/gcc-x1e80100.c
> +++ b/drivers/clk/qcom/gcc-x1e80100.c
> @@ -4,8 +4,9 @@
>   */
> =20
>  #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>
> =20
>  #include <dt-bindings/clock/qcom,x1e80100-gcc.h>
> --=20
> 2.40.1

Did this get lost somewhere among the merges?  I am still applying the patch
to linux-next.
--=20
Cheers,
Stephen Rothwell

--Sig_/S/UQqlq2sNIGyL.SIsfvLS4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWpyUMACgkQAVBC80lX
0GyWkQf+L0vDJrDDH7ETJZAIiuSjI874TntKzNyCasngpcN2J2sFxUweE51ghqrW
h3WPB3fpnddjz1IGkIOZEPMWVjxXK+NuyI8XIlvrk0p3Vs8uFNJAtX9vTkcTpAlf
it4P/WsdikzL1Q0iwzM3RCgIV8OtfvsDKjMZSLU1DxIG82DtAUMx7O4fKdGBnbWM
VFPhJIPP9EhSX2pjQZXiHcXR5UtYiDACpipAYcF30unu31g5UlWutSpjXiCGklig
UxAtNhFebWTZbGs0yHdTwWabW5WFvxh0VxNyv+Fv9dWfUKNj1JWQkFnonfZCO1Fh
gpsnQSXE7WNTTc5NQwd9fna3rB/rBA==
=2/Ew
-----END PGP SIGNATURE-----

--Sig_/S/UQqlq2sNIGyL.SIsfvLS4--