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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46D2BEB64DC for ; Mon, 17 Jul 2023 07:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229956AbjGQHZE (ORCPT ); Mon, 17 Jul 2023 03:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjGQHZD (ORCPT ); Mon, 17 Jul 2023 03:25:03 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0959F1AE; Mon, 17 Jul 2023 00:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1689578700; x=1721114700; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=7oDVZ9jBgPSkk6CKozwTf/y6QtY1k3odHGa8v29rxyM=; b=DaWe62aDUuTe2vnpl4NMXFApmaNze/aDs7OLmd4ieObxrF6Q7PZbmdKe kLfhMPzss3uw44wIDhZwEHSlwtaoOWCenz1tGZ5utYVE+K049DYBOII4p zLcvGIw2PJBB+B5bZ7NETCobg4FT+Xc04qRqbdjxDahogUzjbZOrC8jmh RjelFd55Z7Hhh5STCohQ3QVAdxp26gQE74mpJHFdA3LlLouAQxL0Qmmsz peKvT1V8gZySU7djKWX36XK73t1N/Jq7fJwyOijcOoxZKFnnqKhjwby8/ yzQzph0+bcbI98MI6XHECnngCo7Bss/drClKFQrwF8d8wUcdbkx0TLcRp A==; X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="224984545" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 17 Jul 2023 00:24:59 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Mon, 17 Jul 2023 00:24:45 -0700 Received: from den-dk-m31857.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.21 via Frontend Transport; Mon, 17 Jul 2023 00:24:40 -0700 Message-ID: <8f9bb0f73dcff472e019f100b81363a896389124.camel@microchip.com> Subject: Re: [PATCH] reset: Explicitly include correct DT includes From: Steen Hegelund To: Rob Herring , Philipp Zabel , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Damien Le Moal , Neil Armstrong , "Kevin Hilman" , Jerome Brunet , "Martin Blumenstingl" , Lars Povlsen , Daniel Machon , , Conor Dooley , Daire McNamara , Andy Gross , Bjorn Andersson , Konrad Dybcio , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek CC: , , , , , Date: Mon, 17 Jul 2023 09:24:39 +0200 In-Reply-To: <20230714174939.4063667-1-robh@kernel.org> References: <20230714174939.4063667-1-robh@kernel.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Rob, On Fri, 2023-07-14 at 11:49 -0600, Rob Herring wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know th= e > content is safe >=20 > 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. >=20 > Signed-off-by: Rob Herring > --- > =C2=A0drivers/reset/hisilicon/hi6220_reset.c | 1 - > =C2=A0drivers/reset/hisilicon/reset-hi3660.c | 2 +- > =C2=A0drivers/reset/reset-imx7.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 2 +- > =C2=A0drivers/reset/reset-intel-gw.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 | 2 +- > =C2=A0drivers/reset/reset-k210.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 1 - > =C2=A0drivers/reset/reset-meson-audio-arb.c=C2=A0 | 3 ++- > =C2=A0drivers/reset/reset-meson.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 | 1 - > =C2=A0drivers/reset/reset-microchip-sparx5.c | 3 ++- > =C2=A0drivers/reset/reset-mpfs.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 1 + > =C2=A0drivers/reset/reset-qcom-aoss.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 | 2 +- > =C2=A0drivers/reset/reset-qcom-pdc.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 | 2 +- > =C2=A0drivers/reset/reset-simple.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 | 1 - > =C2=A0drivers/reset/reset-uniphier-glue.c=C2=A0=C2=A0=C2=A0 | 2 +- > =C2=A0drivers/reset/reset-uniphier.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 | 1 - > =C2=A0drivers/reset/reset-zynqmp.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 | 1 - > =C2=A015 files changed, 11 insertions(+), 14 deletions(-) >=20 > diff --git a/drivers/reset/hisilicon/hi6220_reset.c > b/drivers/reset/hisilicon/hi6220_reset.c > index 5ca145b64e63..8d1fce18ded7 100644 > --- a/drivers/reset/hisilicon/hi6220_reset.c > +++ b/drivers/reset/hisilicon/hi6220_reset.c > @@ -13,7 +13,6 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/hisilicon/reset-hi3660.c > b/drivers/reset/hisilicon/reset-hi3660.c > index 965f5ceba7d8..087f28e326ee 100644 > --- a/drivers/reset/hisilicon/reset-hi3660.c > +++ b/drivers/reset/hisilicon/reset-hi3660.c > @@ -6,7 +6,7 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c > index d2408725eb2c..dd01fe11c5cb 100644 > --- a/drivers/reset/reset-imx7.c > +++ b/drivers/reset/reset-imx7.c > @@ -9,7 +9,7 @@ >=20 > =C2=A0#include > =C2=A0#include > -#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-intel-gw.c b/drivers/reset/reset-intel-g= w.c > index effc177db80a..a5a01388ae7f 100644 > --- a/drivers/reset/reset-intel-gw.c > +++ b/drivers/reset/reset-intel-gw.c > @@ -6,7 +6,7 @@ >=20 > =C2=A0#include > =C2=A0#include > -#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-k210.c b/drivers/reset/reset-k210.c > index 1b6e03522b40..b62a2fd44e4e 100644 > --- a/drivers/reset/reset-k210.c > +++ b/drivers/reset/reset-k210.c > @@ -3,7 +3,6 @@ > =C2=A0 * Copyright (c) 2020 Western Digital Corporation or its affiliates= . > =C2=A0 */ > =C2=A0#include > -#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset- > meson-audio-arb.c > index 6a3f6a6a3bbf..7e46dbc04998 100644 > --- a/drivers/reset/reset-meson-audio-arb.c > +++ b/drivers/reset/reset-meson-audio-arb.c > @@ -5,7 +5,8 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include > +#include > +#include > =C2=A0#include > =C2=A0#include >=20 > diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c > index 13878ca2779d..89ac99789a3c 100644 > --- a/drivers/reset/reset-meson.c > +++ b/drivers/reset/reset-meson.c > @@ -14,7 +14,6 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include >=20 > =C2=A0#define BITS_PER_REG=C2=A0=C2=A0 32 >=20 > diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset= - > microchip-sparx5.c > index ead25942061d..636e85c388b0 100644 > --- a/drivers/reset/reset-microchip-sparx5.c > +++ b/drivers/reset/reset-microchip-sparx5.c > @@ -7,9 +7,10 @@ > =C2=A0 * https://github.com/microchip-ung/sparx-5_reginfo > =C2=A0 */ > =C2=A0#include > -#include > +#include > =C2=A0#include > =C2=A0#include > +#include > =C2=A0#include > =C2=A0#include >=20 > diff --git a/drivers/reset/reset-mpfs.c b/drivers/reset/reset-mpfs.c > index e71ab73092ab..7f3fb2d472f4 100644 > --- a/drivers/reset/reset-mpfs.c > +++ b/drivers/reset/reset-mpfs.c > @@ -9,6 +9,7 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-qcom-aoss.c b/drivers/reset/reset-qcom-a= oss.c > index 9333b923dda0..f52e90e36194 100644 > --- a/drivers/reset/reset-qcom-aoss.c > +++ b/drivers/reset/reset-qcom-aoss.c > @@ -8,7 +8,7 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include > +#include > =C2=A0#include >=20 > =C2=A0struct qcom_aoss_reset_map { > diff --git a/drivers/reset/reset-qcom-pdc.c b/drivers/reset/reset-qcom-pd= c.c > index f22bb49a4ac8..a3aae3f902e6 100644 > --- a/drivers/reset/reset-qcom-pdc.c > +++ b/drivers/reset/reset-qcom-pdc.c > @@ -4,7 +4,7 @@ > =C2=A0 */ >=20 > =C2=A0#include > -#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c > index 361a68314265..7ea5adbf2097 100644 > --- a/drivers/reset/reset-simple.c > +++ b/drivers/reset/reset-simple.c > @@ -16,7 +16,6 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset- > uniphier-glue.c > index 15abac9fc72c..38aa953855aa 100644 > --- a/drivers/reset/reset-uniphier-glue.c > +++ b/drivers/reset/reset-uniphier-glue.c > @@ -6,7 +6,7 @@ >=20 > =C2=A0#include > =C2=A0#include > -#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphie= r.c > index ff7580f38056..79c43c204d46 100644 > --- a/drivers/reset/reset-uniphier.c > +++ b/drivers/reset/reset-uniphier.c > @@ -7,7 +7,6 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c > index 59dc0ff9af9e..f0f64ad3472b 100644 > --- a/drivers/reset/reset-zynqmp.c > +++ b/drivers/reset/reset-zynqmp.c > @@ -9,7 +9,6 @@ > =C2=A0#include > =C2=A0#include > =C2=A0#include > -#include >=20 > =C2=A0#define ZYNQMP_NR_RESETS (ZYNQMP_PM_RESET_END - ZYNQMP_PM_RESET_STA= RT) > =C2=A0#define ZYNQMP_RESET_ID ZYNQMP_PM_RESET_START > -- > 2.40.1 >=20 Acked-by: Steen Hegelund BR Steen