staging: Explicitly include correct DT includes
Subsystems (14)
PATCH 1/1 staging: Explicitly include correct DT includes
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.
--- 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(-)
drivers/staging/axis-fifo/axis-fifo.c +2 -4
@@ -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 * ----------------------------
drivers/staging/greybus/arche-platform.c +1 -0
@@ -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 )
drivers/staging/media/imx/imx-media-capture.c +0 -1
@@ -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>
drivers/staging/media/imx/imx-media-dev-common.c +0 -2
@@ -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>
drivers/staging/media/imx/imx8mq-mipi-csi2.c +0 -1
@@ -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>
drivers/staging/media/meson/vdec/esparser.c +0 -1
@@ -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>
drivers/staging/media/meson/vdec/vdec.c +1 -1
@@ -4,7 +4,7 @@* Author: Maxime Jourdan <[email protected]> */ -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/clk.h> #include <linux/io.h> #include <linux/module.h>
drivers/staging/media/sunxi/cedrus/cedrus_hw.c +1 -1
@@ -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>
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c +0 -1
@@ -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>
drivers/staging/media/tegra-video/csi.c +0 -1
@@ -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>
drivers/staging/media/tegra-video/vi.c +1 -1
@@ -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>
drivers/staging/media/tegra-video/vip.c +0 -1
@@ -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>
drivers/staging/most/dim2/dim2.c +1 -1
@@ -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"
drivers/staging/pi433/pi433_if.c +0 -1
@@ -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>
Signature · 1 line
2.40.1
Quoted 10 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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 <[email protected]>
For drivers/staging/greybus/arche-platform.c:
Quoted 3 lines
--- drivers/staging/axis-fifo/axis-fifo.c | 6 ++---- drivers/staging/greybus/arche-platform.c | 1 +
. . .
Quoted 3 lines · On Fri, 14 Jul 2023 11:50:01 -0600 Rob Herring <[email protected]> wrote:
drivers/staging/media/tegra-video/csi.c | 1 - drivers/staging/media/tegra-video/vi.c | 2 +- drivers/staging/media/tegra-video/vip.c | 1 -
Signature · 8 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 11 lines · Rob Herring
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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.
Quoted 3 lines
Signed-off-by Rob Herring <[email protected]>--- drivers/staging/most/dim2/dim2.c | 2 +-
Quoted 24 lines
drivers/staging/most/dim2/dim2.c +1
-2@@ -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" --2.40.1
Quoted 10 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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 <[email protected]>
Quoted 16 lines
--- 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:
Regards,
Hans
Quoted 195 lines
drivers/staging/axis-fifo/axis-fifo.c +2
-4@@ -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 * ---------------------------- drivers/staging/greybus/arche-platform.c +1
-0@@ -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 )drivers/staging/media/imx/imx-media-capture.c +0
-1@@ -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> drivers/staging/media/imx/imx-media-dev-common.c +0
-2@@ -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> drivers/staging/media/imx/imx8mq-mipi-csi2.c +0
-1@@ -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> drivers/staging/media/meson/vdec/esparser.c +0
-1@@ -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> drivers/staging/media/meson/vdec/vdec.c +1
-1@@ -4,7 +4,7 @@* Author: Maxime Jourdan <[email protected]> */ -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> drivers/staging/media/sunxi/cedrus/cedrus_hw.c +1
-1@@ -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> drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c +0
-1@@ -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> drivers/staging/media/tegra-video/csi.c +0
-1@@ -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> drivers/staging/media/tegra-video/vi.c +1
-1@@ -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> drivers/staging/media/tegra-video/vip.c +0
-1@@ -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> drivers/staging/most/dim2/dim2.c +1
-1@@ -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" drivers/staging/pi433/pi433_if.c +0
-1@@ -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>