Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: 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.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

authored by

Rob Herring and committed by
Hans Verkuil
7c7e33b7 b97719a6

+44 -71
+1
drivers/media/cec/core/cec-notifier.c
··· 7 7 */ 8 8 9 9 #include <linux/export.h> 10 + #include <linux/platform_device.h> 10 11 #include <linux/string.h> 11 12 #include <linux/slab.h> 12 13 #include <linux/i2c.h>
-1
drivers/media/cec/platform/stm32/stm32-cec.c
··· 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_device.h> 14 13 #include <linux/platform_device.h> 15 14 #include <linux/regmap.h> 16 15
+1 -1
drivers/media/dvb-frontends/mn88443x.c
··· 8 8 #include <linux/clk.h> 9 9 #include <linux/delay.h> 10 10 #include <linux/gpio/consumer.h> 11 - #include <linux/of_device.h> 11 + #include <linux/of.h> 12 12 #include <linux/regmap.h> 13 13 #include <media/dvb_math.h> 14 14
+1 -1
drivers/media/i2c/imx290.c
··· 13 13 #include <linux/gpio/consumer.h> 14 14 #include <linux/i2c.h> 15 15 #include <linux/module.h> 16 - #include <linux/of_device.h> 16 + #include <linux/of.h> 17 17 #include <linux/pm_runtime.h> 18 18 #include <linux/regmap.h> 19 19 #include <linux/regulator/consumer.h>
+1 -1
drivers/media/i2c/imx296.c
··· 9 9 #include <linux/gpio/consumer.h> 10 10 #include <linux/i2c.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 12 + #include <linux/of.h> 13 13 #include <linux/pm_runtime.h> 14 14 #include <linux/regmap.h> 15 15 #include <linux/regulator/consumer.h>
+1 -1
drivers/media/i2c/imx415.c
··· 9 9 #include <linux/gpio/consumer.h> 10 10 #include <linux/i2c.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 12 + #include <linux/of.h> 13 13 #include <linux/pm_runtime.h> 14 14 #include <linux/regmap.h> 15 15 #include <linux/regulator/consumer.h>
+1 -1
drivers/media/i2c/ov2680.c
··· 16 16 #include <linux/err.h> 17 17 #include <linux/i2c.h> 18 18 #include <linux/init.h> 19 + #include <linux/mod_devicetable.h> 19 20 #include <linux/module.h> 20 - #include <linux/of_device.h> 21 21 #include <linux/gpio/consumer.h> 22 22 #include <linux/regulator/consumer.h> 23 23
+1 -1
drivers/media/i2c/ov5640.c
··· 13 13 #include <linux/gpio/consumer.h> 14 14 #include <linux/i2c.h> 15 15 #include <linux/init.h> 16 + #include <linux/mod_devicetable.h> 16 17 #include <linux/module.h> 17 - #include <linux/of_device.h> 18 18 #include <linux/pm_runtime.h> 19 19 #include <linux/regulator/consumer.h> 20 20 #include <linux/slab.h>
+1 -1
drivers/media/i2c/video-i2c.c
··· 16 16 #include <linux/kthread.h> 17 17 #include <linux/i2c.h> 18 18 #include <linux/list.h> 19 + #include <linux/mod_devicetable.h> 19 20 #include <linux/module.h> 20 21 #include <linux/mutex.h> 21 - #include <linux/of_device.h> 22 22 #include <linux/pm_runtime.h> 23 23 #include <linux/nvmem-provider.h> 24 24 #include <linux/regmap.h>
-1
drivers/media/platform/allegro-dvt/allegro-core.c
··· 17 17 #include <linux/mfd/syscon/xlnx-vcu.h> 18 18 #include <linux/module.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/platform_device.h> 22 21 #include <linux/pm_runtime.h> 23 22 #include <linux/regmap.h>
-2
drivers/media/platform/amphion/vpu_cmds.c
··· 9 9 #include <linux/list.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 - #include <linux/of_address.h> 14 12 #include <linux/platform_device.h> 15 13 #include <linux/slab.h> 16 14 #include <linux/types.h>
+1 -1
drivers/media/platform/amphion/vpu_core.c
··· 9 9 #include <linux/list.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 12 + #include <linux/of.h> 13 13 #include <linux/of_address.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/slab.h>
+2 -2
drivers/media/platform/amphion/vpu_drv.c
··· 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 12 #include <linux/dma-map-ops.h> 13 - #include <linux/of_device.h> 14 - #include <linux/of_address.h> 13 + #include <linux/of.h> 14 + #include <linux/of_platform.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/slab.h> 17 17 #include <linux/types.h>
-2
drivers/media/platform/amphion/vpu_malone.c
··· 9 9 #include <linux/list.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 - #include <linux/of_address.h> 14 12 #include <linux/platform_device.h> 15 13 #include <linux/delay.h> 16 14 #include <linux/rational.h>
-2
drivers/media/platform/amphion/vpu_mbox.c
··· 9 9 #include <linux/list.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 - #include <linux/of_address.h> 14 12 #include <linux/platform_device.h> 15 13 #include "vpu.h" 16 14 #include "vpu_mbox.h"
-2
drivers/media/platform/amphion/vpu_rpc.c
··· 9 9 #include <linux/list.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 - #include <linux/of_address.h> 14 12 #include <linux/platform_device.h> 15 13 #include <linux/firmware/imx/ipc.h> 16 14 #include <linux/firmware/imx/svc/misc.h>
-2
drivers/media/platform/amphion/vpu_windsor.c
··· 9 9 #include <linux/list.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 - #include <linux/of_address.h> 14 12 #include <linux/platform_device.h> 15 13 #include <linux/time64.h> 16 14 #include <media/videobuf2-v4l2.h>
-1
drivers/media/platform/aspeed/aspeed-video.c
··· 13 13 #include <linux/module.h> 14 14 #include <linux/mutex.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/of_irq.h> 18 17 #include <linux/of_reserved_mem.h> 19 18 #include <linux/platform_device.h>
+2 -1
drivers/media/platform/chips-media/coda-common.c
··· 19 19 #include <linux/irq.h> 20 20 #include <linux/kfifo.h> 21 21 #include <linux/module.h> 22 - #include <linux/of_device.h> 22 + #include <linux/of.h> 23 + #include <linux/of_platform.h> 23 24 #include <linux/platform_device.h> 24 25 #include <linux/pm_runtime.h> 25 26 #include <linux/slab.h>
+1 -1
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
··· 12 12 #include <linux/kernel.h> 13 13 #include <linux/module.h> 14 14 #include <linux/of.h> 15 - #include <linux/of_device.h> 15 + #include <linux/platform_device.h> 16 16 #include <linux/pm_runtime.h> 17 17 #include <linux/slab.h> 18 18 #include <media/media-device.h>
+2 -2
drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
··· 10 10 #include <linux/irq.h> 11 11 #include <linux/io.h> 12 12 #include <linux/kernel.h> 13 + #include <linux/mod_devicetable.h> 13 14 #include <linux/module.h> 14 - #include <linux/of.h> 15 - #include <linux/of_device.h> 15 + #include <linux/platform_device.h> 16 16 #include <linux/pm_runtime.h> 17 17 #include <linux/slab.h> 18 18 #include <media/media-device.h>
-2
drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
··· 7 7 #include <linux/clk.h> 8 8 #include <linux/device.h> 9 9 #include <linux/of.h> 10 - #include <linux/of_address.h> 11 - #include <linux/of_platform.h> 12 10 13 11 #include "mtk_mdp_comp.h" 14 12
+2 -1
drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
··· 9 9 #include <linux/interrupt.h> 10 10 #include <linux/irq.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 12 #include <linux/of.h> 13 + #include <linux/of_platform.h> 14 + #include <linux/platform_device.h> 14 15 #include <linux/pm_runtime.h> 15 16 #include <media/v4l2-event.h> 16 17 #include <media/v4l2-mem2mem.h>
+1 -2
drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_pm.c
··· 6 6 7 7 #include <linux/clk.h> 8 8 #include <linux/interrupt.h> 9 - #include <linux/of_address.h> 10 - #include <linux/of_platform.h> 9 + #include <linux/of.h> 11 10 #include <linux/pm_runtime.h> 12 11 13 12 #include "mtk_vcodec_dec_hw.h"
+1 -1
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
··· 9 9 #include <linux/interrupt.h> 10 10 #include <linux/irq.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 13 12 #include <linux/of.h> 13 + #include <linux/platform_device.h> 14 14 #include <linux/pm_runtime.h> 15 15 #include <media/v4l2-event.h> 16 16 #include <media/v4l2-mem2mem.h>
+1 -2
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c
··· 5 5 */ 6 6 7 7 #include <linux/clk.h> 8 - #include <linux/of_address.h> 9 - #include <linux/of_platform.h> 8 + #include <linux/of.h> 10 9 #include <linux/pm_runtime.h> 11 10 12 11 #include "mtk_vcodec_enc_pm.h"
-1
drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c
··· 7 7 8 8 #include <linux/module.h> 9 9 #include <linux/of.h> 10 - #include <linux/of_device.h> 11 10 12 11 #include "mtk_vcodec_dec_hw.h" 13 12 #include "mtk_vcodec_drv.h"
+2 -2
drivers/media/platform/mediatek/vpu/mtk_vpu.c
··· 9 9 #include <linux/interrupt.h> 10 10 #include <linux/iommu.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_address.h> 13 - #include <linux/of_irq.h> 12 + #include <linux/of.h> 14 13 #include <linux/of_platform.h> 15 14 #include <linux/of_reserved_mem.h> 15 + #include <linux/platform_device.h> 16 16 #include <linux/sched.h> 17 17 #include <linux/sizes.h> 18 18 #include <linux/dma-mapping.h>
+2 -1
drivers/media/platform/nvidia/tegra-vde/vde.c
··· 12 12 #include <linux/interrupt.h> 13 13 #include <linux/list.h> 14 14 #include <linux/module.h> 15 - #include <linux/of_device.h> 15 + #include <linux/of.h> 16 + #include <linux/platform_device.h> 16 17 #include <linux/pm_runtime.h> 17 18 #include <linux/reset.h> 18 19 #include <linux/slab.h>
-1
drivers/media/platform/nxp/imx-mipi-csis.c
··· 22 22 #include <linux/module.h> 23 23 #include <linux/mutex.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 26 25 #include <linux/platform_device.h> 27 26 #include <linux/pm_runtime.h> 28 27 #include <linux/regulator/consumer.h>
-1
drivers/media/platform/nxp/imx-pxp.c
··· 19 19 #include <linux/iopoll.h> 20 20 #include <linux/module.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/platform_device.h> 24 23 #include <linux/regmap.h> 25 24 #include <linux/sched.h>
+1 -1
drivers/media/platform/nxp/imx7-media-csi.c
··· 11 11 #include <linux/interrupt.h> 12 12 #include <linux/mfd/syscon.h> 13 13 #include <linux/module.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 15 #include <linux/of_graph.h> 16 16 #include <linux/pinctrl/consumer.h> 17 17 #include <linux/platform_device.h>
+1 -1
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
··· 9 9 #include <linux/kernel.h> 10 10 #include <linux/mfd/syscon.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 12 + #include <linux/of.h> 13 13 #include <linux/platform_device.h> 14 14 #include <linux/pm.h> 15 15 #include <linux/pm_runtime.h>
+2 -1
drivers/media/platform/qcom/venus/core.c
··· 11 11 #include <linux/devcoredump.h> 12 12 #include <linux/list.h> 13 13 #include <linux/module.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 + #include <linux/of_platform.h> 15 16 #include <linux/platform_device.h> 16 17 #include <linux/slab.h> 17 18 #include <linux/types.h>
+1 -1
drivers/media/platform/qcom/venus/hfi_platform.c
··· 2 2 /* 3 3 * Copyright (c) 2020, The Linux Foundation. All rights reserved. 4 4 */ 5 - #include <linux/of_device.h> 5 + #include <linux/of.h> 6 6 #include "hfi_platform.h" 7 7 #include "core.h" 8 8
+1 -1
drivers/media/platform/renesas/rcar-isp.c
··· 12 12 13 13 #include <linux/module.h> 14 14 #include <linux/mutex.h> 15 - #include <linux/of_device.h> 15 + #include <linux/of.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/pm_runtime.h> 18 18 #include <linux/reset.h>
-1
drivers/media/platform/renesas/rcar-vin/rcar-core.c
··· 12 12 13 13 #include <linux/module.h> 14 14 #include <linux/of.h> 15 - #include <linux/of_device.h> 16 15 #include <linux/of_graph.h> 17 16 #include <linux/platform_device.h> 18 17 #include <linux/pm_runtime.h>
-1
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
··· 10 10 #include <linux/io.h> 11 11 #include <linux/module.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_device.h> 14 13 #include <linux/of_graph.h> 15 14 #include <linux/platform_device.h> 16 15 #include <linux/pm_runtime.h>
+2 -1
drivers/media/platform/renesas/rcar_drif.c
··· 44 44 #include <linux/ioctl.h> 45 45 #include <linux/iopoll.h> 46 46 #include <linux/module.h> 47 + #include <linux/of.h> 47 48 #include <linux/of_graph.h> 48 - #include <linux/of_device.h> 49 + #include <linux/of_platform.h> 49 50 #include <linux/platform_device.h> 50 51 #include <linux/sched.h> 51 52 #include <media/v4l2-async.h>
-1
drivers/media/platform/renesas/rcar_fdp1.c
··· 18 18 #include <linux/interrupt.h> 19 19 #include <linux/module.h> 20 20 #include <linux/of.h> 21 - #include <linux/of_device.h> 22 21 #include <linux/platform_device.h> 23 22 #include <linux/pm_runtime.h> 24 23 #include <linux/sched.h>
-1
drivers/media/platform/renesas/rcar_jpu.c
··· 22 22 #include <linux/kernel.h> 23 23 #include <linux/module.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 26 25 #include <linux/platform_device.h> 27 26 #include <linux/slab.h> 28 27 #include <linux/spinlock.h>
-1
drivers/media/platform/renesas/renesas-ceu.c
··· 22 22 #include <linux/mm.h> 23 23 #include <linux/module.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 26 25 #include <linux/of_graph.h> 27 26 #include <linux/platform_device.h> 28 27 #include <linux/pm_runtime.h>
-1
drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
··· 14 14 #include <linux/module.h> 15 15 #include <linux/mod_devicetable.h> 16 16 #include <linux/of.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/of_graph.h> 19 18 #include <linux/platform_device.h> 20 19 #include <linux/pm_runtime.h>
-1
drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
··· 11 11 #include <linux/io.h> 12 12 #include <linux/module.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 15 14 #include <linux/of_graph.h> 16 15 #include <linux/platform_device.h> 17 16 #include <linux/pm_runtime.h>
-1
drivers/media/platform/renesas/vsp1/vsp1_drv.c
··· 13 13 #include <linux/interrupt.h> 14 14 #include <linux/module.h> 15 15 #include <linux/of.h> 16 - #include <linux/of_device.h> 17 16 #include <linux/platform_device.h> 18 17 #include <linux/pm_runtime.h> 19 18 #include <linux/reset.h>
+1 -1
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
··· 13 13 #include <linux/module.h> 14 14 #include <linux/of.h> 15 15 #include <linux/of_graph.h> 16 - #include <linux/of_platform.h> 16 + #include <linux/platform_device.h> 17 17 #include <linux/pinctrl/consumer.h> 18 18 #include <linux/pm_runtime.h> 19 19 #include <media/v4l2-fwnode.h>
-1
drivers/media/platform/samsung/exynos-gsc/gsc-core.c
··· 20 20 #include <linux/slab.h> 21 21 #include <linux/clk.h> 22 22 #include <linux/of.h> 23 - #include <linux/of_device.h> 24 23 #include <media/v4l2-ioctl.h> 25 24 26 25 #include "gsc-core.h"
-1
drivers/media/platform/samsung/exynos4-is/fimc-core.c
··· 19 19 #include <linux/mfd/syscon.h> 20 20 #include <linux/io.h> 21 21 #include <linux/of.h> 22 - #include <linux/of_device.h> 23 22 #include <linux/slab.h> 24 23 #include <linux/clk.h> 25 24 #include <media/v4l2-ioctl.h>
-1
drivers/media/platform/samsung/exynos4-is/media-dev.c
··· 17 17 #include <linux/module.h> 18 18 #include <linux/of.h> 19 19 #include <linux/of_platform.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/of_graph.h> 22 21 #include <linux/pinctrl/consumer.h> 23 22 #include <linux/platform_device.h>
-1
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
··· 12 12 #include <linux/module.h> 13 13 #include <linux/mutex.h> 14 14 #include <linux/of.h> 15 - #include <linux/of_device.h> 16 15 #include <linux/of_graph.h> 17 16 #include <linux/platform_device.h> 18 17 #include <linux/pm_runtime.h>
-1
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
··· 11 11 #include <linux/interrupt.h> 12 12 #include <linux/module.h> 13 13 #include <linux/of.h> 14 - #include <linux/of_device.h> 15 14 #include <linux/platform_device.h> 16 15 #include <linux/pm_runtime.h> 17 16 #include <linux/regmap.h>
-1
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
··· 7 7 #include <linux/clk.h> 8 8 #include <linux/module.h> 9 9 #include <linux/of.h> 10 - #include <linux/of_device.h> 11 10 #include <linux/phy/phy.h> 12 11 #include <linux/platform_device.h> 13 12 #include <linux/pm_runtime.h>
-1
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
··· 8 8 #include <linux/clk.h> 9 9 #include <linux/module.h> 10 10 #include <linux/of.h> 11 - #include <linux/of_device.h> 12 11 #include <linux/phy/phy.h> 13 12 #include <linux/platform_device.h> 14 13 #include <linux/pm_runtime.h>
+2 -2
drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
··· 11 11 #include <linux/interrupt.h> 12 12 #include <linux/io.h> 13 13 #include <linux/iopoll.h> 14 + #include <linux/mod_devicetable.h> 14 15 #include <linux/module.h> 15 - #include <linux/of.h> 16 - #include <linux/of_device.h> 16 + #include <linux/platform_device.h> 17 17 #include <linux/pm_runtime.h> 18 18 #include <linux/reset.h> 19 19
+2 -2
drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
··· 9 9 #include <linux/interrupt.h> 10 10 #include <linux/io.h> 11 11 #include <linux/iopoll.h> 12 + #include <linux/mod_devicetable.h> 12 13 #include <linux/module.h> 13 - #include <linux/of.h> 14 - #include <linux/of_device.h> 14 + #include <linux/platform_device.h> 15 15 #include <linux/pm_runtime.h> 16 16 #include <linux/reset.h> 17 17
+1 -1
drivers/media/platform/ti/cal/cal.c
··· 13 13 #include <linux/interrupt.h> 14 14 #include <linux/mfd/syscon.h> 15 15 #include <linux/module.h> 16 - #include <linux/of_device.h> 16 + #include <linux/of.h> 17 17 #include <linux/platform_device.h> 18 18 #include <linux/pm_runtime.h> 19 19 #include <linux/regmap.h>
+1 -1
drivers/media/rc/meson-ir.c
··· 10 10 #include <linux/interrupt.h> 11 11 #include <linux/io.h> 12 12 #include <linux/module.h> 13 - #include <linux/of_platform.h> 13 + #include <linux/of.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/spinlock.h> 16 16 #include <linux/bitfield.h>
+2 -1
drivers/media/rc/mtk-cir.c
··· 8 8 #include <linux/clk.h> 9 9 #include <linux/interrupt.h> 10 10 #include <linux/module.h> 11 - #include <linux/of_platform.h> 11 + #include <linux/of.h> 12 + #include <linux/platform_device.h> 12 13 #include <linux/reset.h> 13 14 #include <media/rc-core.h> 14 15
+2 -1
drivers/media/rc/sunxi-cir.c
··· 13 13 #include <linux/clk.h> 14 14 #include <linux/interrupt.h> 15 15 #include <linux/module.h> 16 - #include <linux/of_platform.h> 16 + #include <linux/of.h> 17 + #include <linux/platform_device.h> 17 18 #include <linux/reset.h> 18 19 #include <media/rc-core.h> 19 20