From: Hans Verkuil <hverkuil@xs4all.nl>
To: Rob Herring <robh@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Vaibhav Hiremath <hvaibhav.linux@gmail.com>,
Johan Hovold <johan@kernel.org>, Alex Elder <elder@kernel.org>,
Steve Longerbeam <slongerbeam@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
Neil Armstrong <neil.armstrong@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Maxime Ripard <mripard@kernel.org>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Sowjanya Komatineni <skomatineni@nvidia.com>,
Luca Ceresoli <luca.ceresoli@bootlin.com>,
Parthiban Veerasooran <parthiban.veerasooran@microchip.com>,
Christian Gromm <christian.gromm@microchip.com>
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
Subject: Re: [PATCH] staging: Explicitly include correct DT includes
Date: Wed, 19 Jul 2023 08:38:59 +0200 [thread overview]
Message-ID: <a5dc2d77-93fd-9a0b-6778-e724be67584e@xs4all.nl> (raw)
In-Reply-To: <20230714175002.4064428-1-robh@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 <robh@kernel.org>
> ---
> 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 <hverkuil-cisco@xs4all.nl>
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 <linux/kernel.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> #include <linux/wait.h>
> #include <linux/mutex.h>
> #include <linux/device.h>
> @@ -32,10 +34,6 @@
> #include <linux/jiffies.h>
> #include <linux/miscdevice.h>
>
> -#include <linux/of_address.h>
> -#include <linux/of_device.h>
> -#include <linux/of_platform.h>
> -
> /* ----------------------------
> * 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 <linux/suspend.h>
> #include <linux/time.h>
> #include <linux/greybus.h>
> +#include <linux/of.h>
> #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 <linux/delay.h>
> #include <linux/fs.h>
> #include <linux/module.h>
> -#include <linux/of_platform.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/platform_device.h>
> #include <linux/sched.h>
> 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 <linux/of_graph.h>
> -#include <linux/of_platform.h>
> #include <media/v4l2-ctrls.h>
> #include <media/v4l2-event.h>
> #include <media/v4l2-ioctl.h>
> 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 <linux/module.h>
> #include <linux/mutex.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/regmap.h>
> 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 <linux/ioctl.h>
> #include <linux/list.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> #include <linux/reset.h>
> #include <linux/interrupt.h>
> #include <media/videobuf2-dma-contig.h>
> 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 <mjourdan@baylibre.com>
> */
>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> #include <linux/clk.h>
> #include <linux/io.h>
> #include <linux/module.h>
> 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 <linux/platform_device.h>
> +#include <linux/of.h>
> #include <linux/of_reserved_mem.h>
> -#include <linux/of_device.h>
> #include <linux/dma-mapping.h>
> #include <linux/interrupt.h>
> #include <linux/clk.h>
> 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 <linux/interrupt.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/regmap.h>
> 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 <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_graph.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
>
> 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 <linux/list.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/of_graph.h>
> +#include <linux/of_platform.h>
> #include <linux/platform_device.h>
> #include <linux/regulator/consumer.h>
> #include <linux/pm_runtime.h>
> 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 <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_graph.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
>
> 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 <linux/module.h>
> -#include <linux/of_platform.h>
> #include <linux/printk.h>
> #include <linux/kernel.h>
> #include <linux/init.h>
> @@ -21,6 +20,7 @@
> #include <linux/sched.h>
> #include <linux/kthread.h>
> #include <linux/most.h>
> +#include <linux/of.h>
> #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 <linux/errno.h>
> #include <linux/mutex.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/interrupt.h>
> #include <linux/irq.h>
> #include <linux/gpio/consumer.h>
prev parent reply other threads:[~2023-07-19 6:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 17:50 [PATCH] staging: Explicitly include correct DT includes Rob Herring
2023-07-14 18:10 ` [greybus-dev] " Alex Elder
2023-07-17 12:38 ` Luca Ceresoli
2023-07-18 4:24 ` Parthiban.Veerasooran
2023-07-19 6:38 ` Hans Verkuil [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a5dc2d77-93fd-9a0b-6778-e724be67584e@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=christian.gromm@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=elder@kernel.org \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=greybus-dev@lists.linaro.org \
--cc=hvaibhav.linux@gmail.com \
--cc=jbrunet@baylibre.com \
--cc=jernej.skrabec@gmail.com \
--cc=johan@kernel.org \
--cc=jonathanh@nvidia.com \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=luca.ceresoli@bootlin.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=p.zabel@pengutronix.de \
--cc=parthiban.veerasooran@microchip.com \
--cc=paul.kocialkowski@bootlin.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=samuel@sholland.org \
--cc=shawnguo@kernel.org \
--cc=skomatineni@nvidia.com \
--cc=slongerbeam@gmail.com \
--cc=thierry.reding@gmail.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox