From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77925C00528 for ; Fri, 14 Jul 2023 18:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5eDFPkM2rdQa7hqaGfyxPSSV583v9kxQvjcQFtq6lJc=; b=Y5ayYmAIrJ+k9k vj9Zx+wXpPVOuMbWaGiAj2Wt+wrDTw+nbv44jNHUjhfFxZ8PO4yJA4tVHLHEK37KjQCzfbLJPcIl1 sFvOMjGVU3pXfDxXsTJY2uFyEnsgOF0fcA2aX7G5V/coeoUYCkhFzEWVctlukp78JzEWKAcVt/VcX wBUHvtCbT0CIQ079UZb2t73NogERitSAxUCZwQp/+p2casJwh71X9k/x13pRh9bMiWt6w3rMnI5Fl jTgEyZgp+y4ThEjns2+WoILTq4d2q/0dqg/M2eMKVoZj7S3LfuXYhaN7B1l7csblM0JxXMFi8MhMG 7IEi+tRWHqX907+gvqwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qKNvC-0071br-0n; Fri, 14 Jul 2023 18:53:42 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qKNv7-0071ad-1Y; Fri, 14 Jul 2023 18:53:39 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1b9ecf0cb4cso13920015ad.2; Fri, 14 Jul 2023 11:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689360815; x=1691952815; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=QDOamkgORfyhvxq4x1buyrQlAhB1+1+FBqiJz6qBSdw=; b=aLQ+ayR80feY09jSqw1sNYN9JFyDvqU/+L4rgzRkSRtlJ/4rq5v3WIcObY1zgSYP0x G6ri/V9axPRhgSREhQNDanHyYI9dngG/xyAf11L4q5ii2e1FkEZVD15pFBO6IIxv6IFa MyK50maYXkNf1vnDtoRe8w23o6D6PAmivX10urXUoHjvfawgMYh9BajgLe5h7Mt1/dTo 3H/Dqksdh9gUoaMxNkNIPd7gE6oNRdU2nnBeO6OzVjVQyzeHcdZALeX0UXSCw2NaL4m3 mB1Gq5teUcp7iorOrA0LjAeOPuyq7JPkDK9MAmDcvCbaOXuxGVFYokeERCWtYsaC0yas pOGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689360815; x=1691952815; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QDOamkgORfyhvxq4x1buyrQlAhB1+1+FBqiJz6qBSdw=; b=K0X+CAuqMbYPsricoLndXOEa+Zl+TIHceNw6LaFqRzZtntpFQxgCIAed4af/cJZ7Wl e4nI/C4Ag/0ozhpRVdWTJi4VETMu77Ws7uFf0bRXegMF3qlsa9catSv3wut8RnHFpc2Y qdq47QkHtOF/n0t/l0N8SMorlf8vvUbCjm+DUmgN1Nqo8+AklevcIr/0CV9LP+Tq6FH2 8h7V6dqgMHz5XVIe/tTPncI0dhUH7DaneLb8PS1CkdhPQ5E+4aCPnw2cPr1UEzKqYCld 5+mXPPh1wgdQKIT/qt77FOORNJPedUX2BiTpwLmexpEuRAp0gERzqb8rKZAzYo50DdQ/ halQ== X-Gm-Message-State: ABy/qLbIY/f4KTiQlUq7eP9fvwMu0HTqhrgHIBW2HTUAUkBkPODviszb S9ka1AGNXlAlicknWPvMnEE= X-Google-Smtp-Source: APBJJlHd2lueNojMXmcaO3BccJXFGwkfa7lKKhJW7wZhhZJftxpLnmhRdzyPunVGNePBwM08mMqRPQ== X-Received: by 2002:a17:903:442:b0:1b8:95a2:d87e with SMTP id iw2-20020a170903044200b001b895a2d87emr4022333plb.2.1689360815298; Fri, 14 Jul 2023 11:53:35 -0700 (PDT) Received: from ?IPV6:2600:1700:e321:62f0:329c:23ff:fee3:9d7c? ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id ji19-20020a170903325300b001b869410ed2sm8144811plb.72.2023.07.14.11.53.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jul 2023 11:53:34 -0700 (PDT) Message-ID: <83bfbafd-eb9a-4549-4d06-c71a0e12d321@roeck-us.net> Date: Fri, 14 Jul 2023 11:53:30 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] watchdog: Explicitly include correct DT includes Content-Language: en-US To: Rob Herring , =?UTF-8?Q?Marek_Beh=c3=ban?= , Wim Van Sebroeck , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Matthias Brugger , AngeloGioacchino Del Regno , Srinivas Neeli , Shubhrajyoti Datta , Michal Simek , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Alim Akhtar , Xingyu Wu , Samin Guo , Maxime Coquelin , Alexandre Torgue , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-sunxi@lists.linux.dev References: <20230714175040.4065660-1-robh@kernel.org> From: Guenter Roeck In-Reply-To: <20230714175040.4065660-1-robh@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230714_115337_528978_B5CF3F70 X-CRM114-Status: GOOD ( 21.71 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On 7/14/23 10:50, Rob Herring wrote: > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring Reviewed-by: Guenter Roeck > --- > drivers/watchdog/armada_37xx_wdt.c | 1 - > drivers/watchdog/at91rm9200_wdt.c | 3 +-- > drivers/watchdog/cpwd.c | 2 +- > drivers/watchdog/ftwdt010_wdt.c | 6 ++---- > drivers/watchdog/imx2_wdt.c | 3 +-- > drivers/watchdog/imx7ulp_wdt.c | 1 - > drivers/watchdog/meson_wdt.c | 4 ++-- > drivers/watchdog/mtk_wdt.c | 1 - > drivers/watchdog/of_xilinx_wdt.c | 3 +-- > drivers/watchdog/pic32-dmt.c | 3 +-- > drivers/watchdog/pic32-wdt.c | 3 +-- > drivers/watchdog/pika_wdt.c | 2 +- > drivers/watchdog/qcom-wdt.c | 1 - > drivers/watchdog/rave-sp-wdt.c | 2 +- > drivers/watchdog/riowd.c | 2 +- > drivers/watchdog/rza_wdt.c | 4 ++-- > drivers/watchdog/rzg2l_wdt.c | 2 +- > drivers/watchdog/s3c2410_wdt.c | 1 - > drivers/watchdog/sama5d4_wdt.c | 1 - > drivers/watchdog/sbsa_gwdt.c | 3 +-- > drivers/watchdog/starfive-wdt.c | 3 ++- > drivers/watchdog/stm32_iwdg.c | 1 - > drivers/watchdog/sunxi_wdt.c | 1 - > drivers/watchdog/xilinx_wwdt.c | 4 ++-- > 24 files changed, 21 insertions(+), 36 deletions(-) > > diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c > index e58652939f8a..8133a5d05647 100644 > --- a/drivers/watchdog/armada_37xx_wdt.c > +++ b/drivers/watchdog/armada_37xx_wdt.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c > index d20ec27ba354..558015f08c7a 100644 > --- a/drivers/watchdog/at91rm9200_wdt.c > +++ b/drivers/watchdog/at91rm9200_wdt.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -26,8 +27,6 @@ > #include > #include > #include > -#include > -#include > > #define WDT_DEFAULT_TIME 5 /* seconds */ > #define WDT_MAX_TIME 256 /* seconds */ > diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c > index 47250f9b68c7..901b94d456db 100644 > --- a/drivers/watchdog/cpwd.c > +++ b/drivers/watchdog/cpwd.c > @@ -31,7 +31,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include > diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c > index 442c5bf63ff4..28f5af752c10 100644 > --- a/drivers/watchdog/ftwdt010_wdt.c > +++ b/drivers/watchdog/ftwdt010_wdt.c > @@ -14,7 +14,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -221,20 +221,18 @@ static const struct dev_pm_ops ftwdt010_wdt_dev_pm_ops = { > ftwdt010_wdt_resume) > }; > > -#ifdef CONFIG_OF > static const struct of_device_id ftwdt010_wdt_match[] = { > { .compatible = "faraday,ftwdt010" }, > { .compatible = "cortina,gemini-watchdog" }, > {}, > }; > MODULE_DEVICE_TABLE(of, ftwdt010_wdt_match); > -#endif > > static struct platform_driver ftwdt010_wdt_driver = { > .probe = ftwdt010_wdt_probe, > .driver = { > .name = "ftwdt010-wdt", > - .of_match_table = of_match_ptr(ftwdt010_wdt_match), > + .of_match_table = ftwdt010_wdt_match, > .pm = &ftwdt010_wdt_dev_pm_ops, > }, > }; > diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c > index 6fcc3596103c..1a27665a2f53 100644 > --- a/drivers/watchdog/imx2_wdt.c > +++ b/drivers/watchdog/imx2_wdt.c > @@ -26,8 +26,7 @@ > #include > #include > #include > -#include > -#include > +#include > #include > #include > #include > diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c > index 7ca486794ba7..c703586c6e5f 100644 > --- a/drivers/watchdog/imx7ulp_wdt.c > +++ b/drivers/watchdog/imx7ulp_wdt.c > @@ -9,7 +9,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c > index 539feaa1f904..497496f64f55 100644 > --- a/drivers/watchdog/meson_wdt.c > +++ b/drivers/watchdog/meson_wdt.c > @@ -11,11 +11,11 @@ > #include > #include > #include > +#include > #include > #include > -#include > -#include > #include > +#include > #include > #include > > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c > index a9c437598e7e..b2330b16b497 100644 > --- a/drivers/watchdog/mtk_wdt.c > +++ b/drivers/watchdog/mtk_wdt.c > @@ -25,7 +25,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c > index 2a079ca04aa3..05657dc1d36a 100644 > --- a/drivers/watchdog/of_xilinx_wdt.c > +++ b/drivers/watchdog/of_xilinx_wdt.c > @@ -10,14 +10,13 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > #include > #include > -#include > -#include > > /* Register offsets for the Wdt device */ > #define XWT_TWCSR0_OFFSET 0x0 /* Control/Status Register0 */ > diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c > index bc4ccddc75a3..466b4a41411f 100644 > --- a/drivers/watchdog/pic32-dmt.c > +++ b/drivers/watchdog/pic32-dmt.c > @@ -10,9 +10,8 @@ > #include > #include > #include > +#include > #include > -#include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/pic32-wdt.c b/drivers/watchdog/pic32-wdt.c > index 6d1a00222991..4d7eaf290e1c 100644 > --- a/drivers/watchdog/pic32-wdt.c > +++ b/drivers/watchdog/pic32-wdt.c > @@ -10,9 +10,8 @@ > #include > #include > #include > +#include > #include > -#include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c > index a98abd0d3146..782b8c23d99c 100644 > --- a/drivers/watchdog/pika_wdt.c > +++ b/drivers/watchdog/pika_wdt.c > @@ -23,8 +23,8 @@ > #include > #include > #include > +#include > #include > -#include > > #define DRV_NAME "PIKA-WDT" > > diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c > index d776474dcdf3..9e790f0c2096 100644 > --- a/drivers/watchdog/qcom-wdt.c > +++ b/drivers/watchdog/qcom-wdt.c > @@ -11,7 +11,6 @@ > #include > #include > #include > -#include > > enum wdt_reg { > WDT_RST, > diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c > index 2c95615b6354..5d1c2176d445 100644 > --- a/drivers/watchdog/rave-sp-wdt.c > +++ b/drivers/watchdog/rave-sp-wdt.c > @@ -13,7 +13,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c > index c04b383e1712..b293792a292a 100644 > --- a/drivers/watchdog/riowd.c > +++ b/drivers/watchdog/riowd.c > @@ -14,7 +14,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/watchdog/rza_wdt.c b/drivers/watchdog/rza_wdt.c > index fe6c2ed35e04..cb4901b3f777 100644 > --- a/drivers/watchdog/rza_wdt.c > +++ b/drivers/watchdog/rza_wdt.c > @@ -9,9 +9,9 @@ > #include > #include > #include > +#include > #include > -#include > -#include > +#include > #include > #include > > diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c > index d404953d0e0f..1741f98ca67c 100644 > --- a/drivers/watchdog/rzg2l_wdt.c > +++ b/drivers/watchdog/rzg2l_wdt.c > @@ -11,7 +11,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c > index 95416a9bdd4b..2bcc8faa7fa5 100644 > --- a/drivers/watchdog/s3c2410_wdt.c > +++ b/drivers/watchdog/s3c2410_wdt.c > @@ -23,7 +23,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c > index aeee934ca51b..71e8b5fbf51f 100644 > --- a/drivers/watchdog/sama5d4_wdt.c > +++ b/drivers/watchdog/sama5d4_wdt.c > @@ -11,7 +11,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c > index fd3cfdda4949..421ebcda62e6 100644 > --- a/drivers/watchdog/sbsa_gwdt.c > +++ b/drivers/watchdog/sbsa_gwdt.c > @@ -43,10 +43,9 @@ > #include > #include > #include > +#include > #include > #include > -#include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c > index 8058fca4d05d..9e6db8e0164f 100644 > --- a/drivers/watchdog/starfive-wdt.c > +++ b/drivers/watchdog/starfive-wdt.c > @@ -8,7 +8,8 @@ > #include > #include > #include > -#include > +#include > +#include > #include > #include > #include > diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c > index 570a71509d2a..fa5e70c4b93a 100644 > --- a/drivers/watchdog/stm32_iwdg.c > +++ b/drivers/watchdog/stm32_iwdg.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > > diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c > index 6cf82922d3fb..b85354a99582 100644 > --- a/drivers/watchdog/sunxi_wdt.c > +++ b/drivers/watchdog/sunxi_wdt.c > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c > index 2585038d5575..1d998db41533 100644 > --- a/drivers/watchdog/xilinx_wwdt.c > +++ b/drivers/watchdog/xilinx_wwdt.c > @@ -9,9 +9,9 @@ > #include > #include > #include > +#include > #include > -#include > -#include > +#include > #include > > /* Max timeout is calculated at 100MHz source clock */ _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic