From patchwork Fri Dec 8 02:51:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 175535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5207270vqy; Thu, 7 Dec 2023 18:51:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHa9PhDNXxglPDZMd3e6Daceh8EL8k5yygDhxmPxAIzE/cald2csTqcbxi5ICeVJ8+zmOSR X-Received: by 2002:a05:6870:788a:b0:1ff:344d:b3fd with SMTP id hc10-20020a056870788a00b001ff344db3fdmr377400oab.59.1702003910975; Thu, 07 Dec 2023 18:51:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702003910; cv=none; d=google.com; s=arc-20160816; b=Bme3ppQZpolCEp7QuhjdT/0O9LYJAXkLxjj4W6CanTnv+XQkBZGhFfDR+fRwRW0+Vj wEhJq7g9Nku282ns+FamoLqUTO/eb05Rc0MifKj0fxnoQrJUfZKYp/cKQDUHnkFjYqGz X5t1L0QRidoysNJ8w/y8kP+5fR3vZ5uvfehyNkOScZik2XSZloDitazxX1XUOCMMmXAT 7nI71HbT2lhlJzl1I6m6NeyYG+mYUE+p904M2uyVY5bTrmIYFhPcvUO4dLsATMbmqBBE 2bAukjpECn7pAz6p1lkmHJ6QLzNXboJ3Bs+nt9FhODoMWIeUS/BGOlguxaKHo5bFF/4m oG0w== 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=gtfU+2QTWZOU23jlezqw2A+wGCuTv6O7PKwuxidIA3I=; fh=ZRnwUjLuX7Vv/U2e25ED4lYPNjrGpvupGwifuKpBgu0=; b=OvLOu6iImdkAoqxdThDbkDhfq5m1M+K66KSG48nWTYnwCre7mR0DiyJfE81zHZETpb qOGeUg8u620btux0uHcVgL1YPR0dmQXCjDAi6c4eaBrtzgiPrG12SBGw2vPDVDEZ5Mat OwzlE4O9nnAPEahekicP8WglUZd8UrgRpktBFPlBggUxMMPEclOzr1DEcWmsLdc3h55m Q48rWlUFPQI8bj1sXDZkEskTtv/VRN3QstZKKRL12ILDSb5kylHhz2A+MmD9W24mlLsx HdzYXHUs+WaWP1qV6wSCTPiVsr4WCnL2Jyru0yUwko8mEBVG5Ihht8Bqv/F21Jxeyuw0 f9xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="CxHo/BQL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id b12-20020a6541cc000000b005c1cd1ba05csi715250pgq.240.2023.12.07.18.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 18:51:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="CxHo/BQL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id DF8CC80FCC98; Thu, 7 Dec 2023 18:51:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230510AbjLHCvf (ORCPT + 99 others); Thu, 7 Dec 2023 21:51:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbjLHCve (ORCPT ); Thu, 7 Dec 2023 21:51:34 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E05C1715; Thu, 7 Dec 2023 18:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702003895; bh=gtfU+2QTWZOU23jlezqw2A+wGCuTv6O7PKwuxidIA3I=; h=Date:From:To:Cc:Subject:From; b=CxHo/BQLhQX5uV8wVXkKZBDVtU7QfsMx2wKZ1FpqLtsPjwmIRgVKxd4D1jmgetC6h del/gm8yTJNPNAZ263GiDLxJLj3Zr0yTv4zf1IhA7ID78kVzMmOENaMyFxUBTAX9Vj OELvVAqrOOa6AMELYqaMD1LIXyyRJEPrkqjvF75Re4EtLCoY5lagJY+pEC6hXc0Ag8 4ixjV5k6EyaX0QcJrG/Eg28jcEbcTVeDOaBEWKQk036wlOF1jSpKxklD6IIOC9XFaZ la4bWQUBIRgETQGd9qgKMLAQ4G+YIvGXVdaWqp3ASifIYpWiQXhxFT3VqCKWBfJQ/D yFsjdAHZZRH1g== 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 4SmbJ65N2Dz4xG8; Fri, 8 Dec 2023 13:51:34 +1100 (AEDT) Date: Fri, 8 Dec 2023 13:51:33 +1100 From: Stephen Rothwell To: Rob Herring , Krzysztof Kozlowski Cc: Kris Chaplin , Thomas Delev , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the devicetree tree Message-ID: <20231208135133.42704925@canb.auug.org.au> MIME-Version: 1.0 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 fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 07 Dec 2023 18:51:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784680452992994870 X-GMAIL-MSGID: 1784680452992994870 Hi all, After merging the devicetree tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/w1/masters/amd_axi_w1.c: In function 'amd_axi_w1_probe': drivers/w1/masters/amd_axi_w1.c:296:35: error: invalid use of undefined type 'struct platform_device' 296 | struct device *dev = &pdev->dev; | ^~ drivers/w1/masters/amd_axi_w1.c:307:25: error: implicit declaration of function 'devm_platform_ioremap_resource'; did you mean 'devm_ioremap_resource'? [-Werror=implicit-function-declaration] 307 | lp->base_addr = devm_platform_ioremap_resource(pdev, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | devm_ioremap_resource drivers/w1/masters/amd_axi_w1.c:307:23: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 307 | lp->base_addr = devm_platform_ioremap_resource(pdev, 0); | ^ drivers/w1/masters/amd_axi_w1.c:311:19: error: implicit declaration of function 'platform_get_irq'; did you mean 'platform_notify'? [-Werror=implicit-function-declaration] 311 | lp->irq = platform_get_irq(pdev, 0); | ^~~~~~~~~~~~~~~~ | platform_notify drivers/w1/masters/amd_axi_w1.c:360:9: error: implicit declaration of function 'platform_set_drvdata' [-Werror=implicit-function-declaration] 360 | platform_set_drvdata(pdev, lp); | ^~~~~~~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c: In function 'amd_axi_w1_remove': drivers/w1/masters/amd_axi_w1.c:372:39: error: implicit declaration of function 'platform_get_drvdata' [-Werror=implicit-function-declaration] 372 | struct amd_axi_w1_local *lp = platform_get_drvdata(pdev); | ^~~~~~~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:372:39: warning: initialization of 'struct amd_axi_w1_local *' from 'int' makes pointer from integer without a cast [-Wint-conversion] drivers/w1/masters/amd_axi_w1.c: At top level: drivers/w1/masters/amd_axi_w1.c:383:15: error: variable 'amd_axi_w1_driver' has initializer but incomplete type 383 | static struct platform_driver amd_axi_w1_driver = { | ^~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:384:10: error: 'struct platform_driver' has no member named 'probe' 384 | .probe = amd_axi_w1_probe, | ^~~~~ drivers/w1/masters/amd_axi_w1.c:384:18: warning: excess elements in struct initializer 384 | .probe = amd_axi_w1_probe, | ^~~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:384:18: note: (near initialization for 'amd_axi_w1_driver') drivers/w1/masters/amd_axi_w1.c:385:10: error: 'struct platform_driver' has no member named 'remove_new' 385 | .remove_new = amd_axi_w1_remove, | ^~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:385:23: warning: excess elements in struct initializer 385 | .remove_new = amd_axi_w1_remove, | ^~~~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:385:23: note: (near initialization for 'amd_axi_w1_driver') drivers/w1/masters/amd_axi_w1.c:386:10: error: 'struct platform_driver' has no member named 'driver' 386 | .driver = { | ^~~~~~ drivers/w1/masters/amd_axi_w1.c:386:19: error: extra brace group at end of initializer 386 | .driver = { | ^ drivers/w1/masters/amd_axi_w1.c:386:19: note: (near initialization for 'amd_axi_w1_driver') drivers/w1/masters/amd_axi_w1.c:386:19: warning: excess elements in struct initializer drivers/w1/masters/amd_axi_w1.c:386:19: note: (near initialization for 'amd_axi_w1_driver') drivers/w1/masters/amd_axi_w1.c:391:1: warning: data definition has no type or storage class 391 | module_platform_driver(amd_axi_w1_driver); | ^~~~~~~~~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:391:1: error: type defaults to 'int' in declaration of 'module_platform_driver' [-Werror=implicit-int] drivers/w1/masters/amd_axi_w1.c:391:1: warning: parameter names (without types) in function declaration drivers/w1/masters/amd_axi_w1.c:383:31: error: storage size of 'amd_axi_w1_driver' isn't known 383 | static struct platform_driver amd_axi_w1_driver = { | ^~~~~~~~~~~~~~~~~ drivers/w1/masters/amd_axi_w1.c:383:31: warning: 'amd_axi_w1_driver' defined but not used [-Wunused-variable] Caused by commit 0d18bcdebb2f ("of: Stop circularly including of_device.h and of_platform.h") interacting with commit 271c81935801 ("w1: Add AXI 1-wire host driver for AMD programmable logic IP core") from the w1 tree. I have applied the following merge fix patch for today (that could just be applied to the w1 tree). From: Stephen Rothwell Date: Fri, 8 Dec 2023 13:37:03 +1100 Subject: [PATCH] amd_axi_w1: include the correct files This is to cope with "of: Stop circularly including of_device.h and of_platform.h" Signed-off-by: Stephen Rothwell --- drivers/w1/masters/amd_axi_w1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/w1/masters/amd_axi_w1.c b/drivers/w1/masters/amd_axi_w1.c index 24a05c2de5f1..f8b31cae450d 100644 --- a/drivers/w1/masters/amd_axi_w1.c +++ b/drivers/w1/masters/amd_axi_w1.c @@ -13,7 +13,8 @@ #include #include #include -#include +#include +#include #include #include