From patchwork Tue Apr 11 02:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 81691 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2290230vqo; Mon, 10 Apr 2023 19:46:38 -0700 (PDT) X-Google-Smtp-Source: AKy350ZuTJP6wrX856n8G3roDEbpodK5+jlOzrMaBtNHkmo1EfiOzFK4EiuGx62XEUtyI/A140Nv X-Received: by 2002:a17:906:1991:b0:94a:97dd:aed9 with SMTP id g17-20020a170906199100b0094a97ddaed9mr1071528ejd.70.1681181197895; Mon, 10 Apr 2023 19:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681181197; cv=none; d=google.com; s=arc-20160816; b=D37gazye+BEmf2wKuzE8p8Pv9CyYI49jkaviZNmd7ZbvNVhAVWojb8YTEHW4Srt2Mg B68hoQFv/xnMzJurnC8S8kjXSuxv21lSeFYYn0JVQoh/VcJ8uAGK+E091TmHbqTV28rj oJ71T8T6EJSaO/WeeNj0KSnELdtNhp7kSHjMHAwGsc2xfCIfv07nnP2p4DwDqpQfscfp HO74C/l4tQRMAdl6OW2Ks+9X/ihJtpUndnBfS1csXeEIjlmtX+Mui9akMi9Rnj4qe8Yz lEAfrPvZ8+aRrQbgHneGvwlCOOJ6z5yMdSc9e1OXZTIfI0P/MAQ59yMlinIONDfeNjeW iDrA== 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=6e/jGpYDTAVw88CVqimS+a5Lt1DPmUftbnGWNhtg8oo=; b=xc4XKoi/+LznfsZJv7RgfeR9gO8EqbEZpy8kXEvG42IU/rEAFl615QkZ1NZQoJs9mE ABdowI7C/ej50HQcc+FU5GgHz5qPL63c1eHaZbRldox/+YiqIzEZbo18rYPR5UN26dr/ rnwgINxUy15ekZbz1R7Jl2f23OXrGQyFio/6yIt5BY/wIb3jynoAYwWj2/asIR4hXVNw OEunVbKjpvHwXtkIz2aKpwjxc6hQvWTHUFAplyw3lcVQZkzBmmK8nswwO/+fib3ZTJdQ 0XYalCUxivYcZ79+HfQSF56NYOf/PnjzsENwFnGC7ua2G3okrko9Q/mqJBZ/MMOaTC7e ghbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=qp7qUKOZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nc13-20020a1709071c0d00b0094a9138d5d1si1148384ejc.196.2023.04.10.19.46.14; Mon, 10 Apr 2023 19:46:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=qp7qUKOZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229838AbjDKC3A (ORCPT + 99 others); Mon, 10 Apr 2023 22:29:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbjDKC27 (ORCPT ); Mon, 10 Apr 2023 22:28:59 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB9981982; Mon, 10 Apr 2023 19:28:57 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PwVC85ZDvz4xDh; Tue, 11 Apr 2023 12:28:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1681180133; bh=6e/jGpYDTAVw88CVqimS+a5Lt1DPmUftbnGWNhtg8oo=; h=Date:From:To:Cc:Subject:From; b=qp7qUKOZN3NpYLS8Vhe3ldz3K7BJodvVUfG/G0LiHStWw/lT+Opw/mkhahnskU3ls MBr0BfaRXB/DqAEMXBbQh+w0RdchJPWPPO1PuJFYg3doNiizWm3YTIuMw8ZLkV4t2M cWm70kPsbXn94qgsSCWlXh9pMhImJIvjpDYzdueoy+hNrkUfSg3/yJZYC/hCUCzlTO NoMhSJ6dg5MbyKO3fGr9Xzm54gaOPoaGMlhnOF2BHxdPyBVusVqyZ5TXdx6u81oPXR LIkRD0lwv6quiHxcM1tAVsOAhU8PMdDepdPVw+l6LYVFCKp1MQMtIOjXNEgGUUvliD TOF89gPwGEPGA== Date: Tue, 11 Apr 2023 12:28:51 +1000 From: Stephen Rothwell To: Rob Herring Cc: Petr Pavlu , "Rafael J. Wysocki" , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the devicetree tree Message-ID: <20230411122851.57f3dac6@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762846255968451385?= X-GMAIL-MSGID: =?utf-8?q?1762846255968451385?= Hi all, After merging the devicetree tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/cpufreq/acpi-cpufreq.c:1024:15: error: variable 'acpi_cpufreq_platdrv' has initializer but incomplete type 1024 | static struct platform_driver acpi_cpufreq_platdrv = { | ^~~~~~~~~~~~~~~ drivers/cpufreq/acpi-cpufreq.c:1025:10: error: 'struct platform_driver' has no member named 'driver' 1025 | .driver = { | ^~~~~~ drivers/cpufreq/acpi-cpufreq.c:1025:19: error: extra brace group at end of initializer 1025 | .driver = { | ^ drivers/cpufreq/acpi-cpufreq.c:1025:19: note: (near initialization for 'acpi_cpufreq_platdrv') drivers/cpufreq/acpi-cpufreq.c:1025:19: error: excess elements in struct initializer [-Werror] drivers/cpufreq/acpi-cpufreq.c:1025:19: note: (near initialization for 'acpi_cpufreq_platdrv') drivers/cpufreq/acpi-cpufreq.c:1028:10: error: 'struct platform_driver' has no member named 'remove' 1028 | .remove = acpi_cpufreq_remove, | ^~~~~~ drivers/cpufreq/acpi-cpufreq.c:1028:27: error: excess elements in struct initializer [-Werror] 1028 | .remove = acpi_cpufreq_remove, | ^~~~~~~~~~~~~~~~~~~ drivers/cpufreq/acpi-cpufreq.c:1028:27: note: (near initialization for 'acpi_cpufreq_platdrv') drivers/cpufreq/acpi-cpufreq.c: In function 'acpi_cpufreq_init': drivers/cpufreq/acpi-cpufreq.c:1033:16: error: implicit declaration of function 'platform_driver_probe' [-Werror=implicit-function-declaration] 1033 | return platform_driver_probe(&acpi_cpufreq_platdrv, acpi_cpufreq_probe); | ^~~~~~~~~~~~~~~~~~~~~ drivers/cpufreq/acpi-cpufreq.c: In function 'acpi_cpufreq_exit': drivers/cpufreq/acpi-cpufreq.c:1038:9: error: implicit declaration of function 'platform_driver_unregister'; did you mean 'driver_unregister'? [-Werror=implicit-function-declaration] 1038 | platform_driver_unregister(&acpi_cpufreq_platdrv); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | driver_unregister drivers/cpufreq/acpi-cpufreq.c: At top level: drivers/cpufreq/acpi-cpufreq.c:1024:31: error: storage size of 'acpi_cpufreq_platdrv' isn't known 1024 | static struct platform_driver acpi_cpufreq_platdrv = { | ^~~~~~~~~~~~~~~~~~~~ I am not sure which of the include file update commits were the direct cause but they interacted with commit 691a63712347 ("ACPI: cpufreq: Use platform devices to load ACPI PPC and PCC drivers") from the pm tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Tue, 11 Apr 2023 12:15:29 +1000 Subject: [PATCH] devicetree: fix up for include rationalisation interacting with "ACPI: cpufreq: Use platform devices to load ACPI PPC and PCC drivers" Signed-off-by: Stephen Rothwell --- drivers/cpufreq/acpi-cpufreq.c | 1 + drivers/cpufreq/pcc-cpufreq.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index e1a5384cf21c..29904395e95f 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index 0c362932ca60..b4318a1a9335 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c @@ -36,6 +36,7 @@ #include #include #include +#include #include