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 39EDEC001B0 for ; Wed, 19 Jul 2023 06:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229863AbjGSGjM (ORCPT ); Wed, 19 Jul 2023 02:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbjGSGjL (ORCPT ); Wed, 19 Jul 2023 02:39:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB7231FCB; Tue, 18 Jul 2023 23:39:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 29B6360C94; Wed, 19 Jul 2023 06:39:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D2CAC433C7; Wed, 19 Jul 2023 06:39:01 +0000 (UTC) Message-ID: Date: Wed, 19 Jul 2023 08:38:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH] staging: Explicitly include correct DT includes Content-Language: en-US To: Rob Herring , Greg Kroah-Hartman , Vaibhav Hiremath , Johan Hovold , Alex Elder , Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Maxime Ripard , Paul Kocialkowski , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Thierry Reding , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Parthiban Veerasooran , Christian Gromm Cc: devicetree@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, greybus-dev@lists.linaro.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org References: <20230714175002.4064428-1-robh@kernel.org> From: Hans Verkuil In-Reply-To: <20230714175002.4064428-1-robh@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org On 14/07/2023 19: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 > --- > drivers/staging/axis-fifo/axis-fifo.c | 6 ++---- > drivers/staging/greybus/arche-platform.c | 1 + > drivers/staging/media/imx/imx-media-capture.c | 1 - > drivers/staging/media/imx/imx-media-dev-common.c | 2 -- > drivers/staging/media/imx/imx8mq-mipi-csi2.c | 1 - > drivers/staging/media/meson/vdec/esparser.c | 1 - > drivers/staging/media/meson/vdec/vdec.c | 2 +- > drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- > drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 1 - > drivers/staging/media/tegra-video/csi.c | 1 - > drivers/staging/media/tegra-video/vi.c | 2 +- > drivers/staging/media/tegra-video/vip.c | 1 - > drivers/staging/most/dim2/dim2.c | 2 +- > drivers/staging/pi433/pi433_if.c | 1 - > 14 files changed, 7 insertions(+), 17 deletions(-) For staging/media: Reviewed-by: Hans Verkuil Regards, Hans > > diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c > index 98db47cb4fa4..5910fada7075 100644 > --- a/drivers/staging/axis-fifo/axis-fifo.c > +++ b/drivers/staging/axis-fifo/axis-fifo.c > @@ -15,6 +15,8 @@ > */ > > #include > +#include > +#include > #include > #include > #include > @@ -32,10 +34,6 @@ > #include > #include > > -#include > -#include > -#include > - > /* ---------------------------- > * driver parameters > * ---------------------------- > diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c > index ebe835f25d13..891b75327d7f 100644 > --- a/drivers/staging/greybus/arche-platform.c > +++ b/drivers/staging/greybus/arche-platform.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #include "arche_platform.h" > > #if IS_ENABLED(CONFIG_USB_HSIC_USB3613) > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index 4364df27c6d2..4846078315ff 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -7,7 +7,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/staging/media/imx/imx-media-dev-common.c b/drivers/staging/media/imx/imx-media-dev-common.c > index 991820a8500f..7b7cbec08326 100644 > --- a/drivers/staging/media/imx/imx-media-dev-common.c > +++ b/drivers/staging/media/imx/imx-media-dev-common.c > @@ -6,8 +6,6 @@ > * Copyright (c) 2016 Mentor Graphics Inc. > */ > > -#include > -#include > #include > #include > #include > diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c > index ca2efcc21efe..c84b6dceece2 100644 > --- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c > +++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c > index 7b15fc54efe4..4632346f04a9 100644 > --- a/drivers/staging/media/meson/vdec/esparser.c > +++ b/drivers/staging/media/meson/vdec/esparser.c > @@ -11,7 +11,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c > index 5ca4b1200831..219185aaa588 100644 > --- a/drivers/staging/media/meson/vdec/vdec.c > +++ b/drivers/staging/media/meson/vdec/vdec.c > @@ -4,7 +4,7 @@ > * Author: Maxime Jourdan > */ > > -#include > +#include > #include > #include > #include > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > index fa86a658fdc6..b696bf884cbd 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c > @@ -14,8 +14,8 @@ > */ > > #include > +#include > #include > -#include > #include > #include > #include > diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > index 0dc75adbd9d8..8337dc487047 100644 > --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c > index 052172017b3b..e79657920dc8 100644 > --- a/drivers/staging/media/tegra-video/csi.c > +++ b/drivers/staging/media/tegra-video/csi.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > > diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c > index 79284c3b6cae..4add037537a2 100644 > --- a/drivers/staging/media/tegra-video/vi.c > +++ b/drivers/staging/media/tegra-video/vi.c > @@ -11,8 +11,8 @@ > #include > #include > #include > -#include > #include > +#include > #include > #include > #include > diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c > index a1ab886acc18..4cf3fde7e034 100644 > --- a/drivers/staging/media/tegra-video/vip.c > +++ b/drivers/staging/media/tegra-video/vip.c > @@ -13,7 +13,6 @@ > #include > #include > #include > -#include > #include > #include > > diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c > index 44d3252d4612..ed6a9cc88541 100644 > --- a/drivers/staging/most/dim2/dim2.c > +++ b/drivers/staging/most/dim2/dim2.c > @@ -8,7 +8,6 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include > -#include > #include > #include > #include > @@ -21,6 +20,7 @@ > #include > #include > #include > +#include > #include "hal.h" > #include "errors.h" > #include "sysfs.h" > diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c > index 220e157d4a5e..58887619b83f 100644 > --- a/drivers/staging/pi433/pi433_if.c > +++ b/drivers/staging/pi433/pi433_if.c > @@ -31,7 +31,6 @@ > #include > #include > #include > -#include > #include > #include > #include