[PATCH] staging: Explicitly include correct DT includes

Tue Jul 18 23:38:59 PDT 2023

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 at 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 at 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 at 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>