Message ID | 20231211160510.0aef871b@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6837776vqy; Sun, 10 Dec 2023 21:05:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IH41ZTdyp+PRQDIkjKrN+Ni7XTHaPUZS+w9T21RkLK/Bx/ZqFrijUJgkmf5f+J68ZsWkxBP X-Received: by 2002:a05:6a00:cd2:b0:6ce:54dc:2d0b with SMTP id b18-20020a056a000cd200b006ce54dc2d0bmr6139798pfv.1.1702271121080; Sun, 10 Dec 2023 21:05:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702271121; cv=none; d=google.com; s=arc-20160816; b=tdMMilyP6/xoNXySUjeieMw4toKVJzBrAOXOhtu3pAoE5s5Eb8jDfHX21i/ZuCLkyb euTcA74JKwawRM5nnhO+1gZWEDKGix405Jqev1mo9DXloqr//wj2coxool+JzzSWmBqh jh26lK5kTyY2wieO1/cxXb/3fco7MVIlXRRZjXPoG9eZIv9aTFZvqq3L7DwhaZ5D+lGY Vt0iyN77TFzT3CqomQ/uuUrPil0uFX29L2MrDF6DeDgkAFWHj1UFIgltyCR1Wnj55bT1 yW22IM8x5Q06AmxeiE0y128ddVRrOM5WvJoDdg6BpYikVBblf+pr0fvNZLmQQUAvZOaQ 74UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=2bMvFBYXWcfp2ouUWoL02aetKfFSicVSbQG0BnVLvgw=; fh=Rvcc53TA5gJW3o3Tx/uaoTS/ZyD3XMH3cFlyErzMIXQ=; b=Tnng+YYSfsQNXXOO8dmLEDEBbSQO+lCTTWnMRLnEDzdh7uUsHvGX+69GGDSHipReKp y1wH3cIZwL9QvpLryuacTwFtJO5Gv64oghlNFuXo9TTOcK9lZnwfKmTSBEiZ7w1JstlP JM9GHl9BCH5qt24hzaOqsg8leMajvvbLLJqUBxEYG8JgSVNjnZE5h8aXw7pyG8mBfSPG UsANX2wlaVmrxbIqE0S8DhOYOnI15ZmrfBlsaicZfH0CUYyAlU0kx7bAAcPlf7ivffdG H1Yj73u+1bP1UnearKivpywcHa/H0s4211GNIbi9FdUOmPlHtb0aN+aqx/uqV3PjRCFG hSjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PiI14Tvr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id fh3-20020a056a00390300b006ce010d03d1si5434130pfb.295.2023.12.10.21.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 21:05:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PiI14Tvr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 4A1118067A71; Sun, 10 Dec 2023 21:05:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbjLKFFI (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Mon, 11 Dec 2023 00:05:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjLKFFG (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 11 Dec 2023 00:05:06 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD6C0BB; Sun, 10 Dec 2023 21:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702271111; bh=2bMvFBYXWcfp2ouUWoL02aetKfFSicVSbQG0BnVLvgw=; h=Date:From:To:Cc:Subject:From; b=PiI14TvrhiVFtc8aqiRfqwnZLdh5fV1fI3RO7F3P00x+K/0Tj0z6e64Y+7dwcCFie NZtkxbHsX+qvtWlagIieu+BPK7HUPTxU7E7G1nWm9pFOmff7pgvvIFtzM7k9tlOpNE pkDwbRqt46b5d/swC30mPfpYkLcfp/3WXPHXExPbuGtRbX7et9Nd96zoq+PV2oasoO EMhQKZyVIEBCmOksHdOgsGeKjbwLiK9j6T4pO9zLjUJEeHiOLWI/M4czNOX3J/H8gU l2Kdmx8mN1XrZ2yg3WoS8iG/h5cEHcnk8BFd8q7k5DtUvZrcL4El0njJAZloWIrMbd /ai27P+uSQJiw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SpV6t6wJ6z4wdD; Mon, 11 Dec 2023 16:05:10 +1100 (AEDT) Date: Mon, 11 Dec 2023 16:05:10 +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: linux-next: build failure after merge of the devicetree tree Message-ID: <20231211160510.0aef871b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NifI8pb5z4tTy.c4lsC=IVl"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 10 Dec 2023 21:05:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784960642893913591 X-GMAIL-MSGID: 1784960642893913591 |
Series |
linux-next: build failure after merge of the devicetree tree
|
|
Commit Message
Stephen Rothwell
Dec. 11, 2023, 5:05 a.m. UTC
Hi all, 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> --- drivers/clk/qcom/gcc-x1e80100.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Comments
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>
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: > > 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> > --- > 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> > -- > 2.40.1 Did this get lost somewhere among the merges? I am still applying the patch to linux-next.
On Thu, Jan 18, 2024 at 6:58 PM Stephen Rothwell <sfr@canb.auug.orgau> wrote: > > 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: > > > > 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> > > --- > > 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> > > -- > > 2.40.1 > > Did this get lost somewhere among the merges? I am still applying the patch > to linux-next. Thanks for pointing that out. I guess the QCom folks never applied it. I'm going to send the final patch to Linus today and will add this one in. Rob
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>