On Fri, Jul 14, 2023 at 12:47 PM Rob Herring <robh@xxxxxxxxxx> 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@xxxxxxxxxx>
> ---
> drivers/mailbox/arm_mhu.c | 1 +
> drivers/mailbox/arm_mhu_db.c | 1 -
> drivers/mailbox/hi3660-mailbox.c | 1 +
> drivers/mailbox/hi6220-mailbox.c | 1 +
> drivers/mailbox/imx-mailbox.c | 3 ++-
> drivers/mailbox/mailbox-mpfs.c | 1 +
> drivers/mailbox/mailbox.c | 1 +
> drivers/mailbox/mtk-adsp-mailbox.c | 3 ++-
> drivers/mailbox/mtk-cmdq-mailbox.c | 2 +-
> drivers/mailbox/omap-mailbox.c | 2 +-
> drivers/mailbox/platform_mhu.c | 1 +
> drivers/mailbox/rockchip-mailbox.c | 2 +-
> drivers/mailbox/sprd-mailbox.c | 2 +-
> drivers/mailbox/stm32-ipcc.c | 1 +
> drivers/mailbox/tegra-hsp.c | 1 -
> drivers/mailbox/zynqmp-ipi-mailbox.c | 2 --
> 16 files changed, 15 insertions(+), 10 deletions(-)
Ping!
>
> diff --git a/drivers/mailbox/arm_mhu.c b/drivers/mailbox/arm_mhu.c
> index 22243cabe056..537f7bfb7b06 100644
> --- a/drivers/mailbox/arm_mhu.c
> +++ b/drivers/mailbox/arm_mhu.c
> @@ -12,6 +12,7 @@
> #include <linux/io.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> +#include <linux/of.h>
>
> #define INTR_STAT_OFS 0x0
> #define INTR_SET_OFS 0x8
> diff --git a/drivers/mailbox/arm_mhu_db.c b/drivers/mailbox/arm_mhu_db.c
> index aa0a4d83880f..27a510d46908 100644
> --- a/drivers/mailbox/arm_mhu_db.c
> +++ b/drivers/mailbox/arm_mhu_db.c
> @@ -15,7 +15,6 @@
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
>
> #define INTR_STAT_OFS 0x0
> #define INTR_SET_OFS 0x8
> diff --git a/drivers/mailbox/hi3660-mailbox.c b/drivers/mailbox/hi3660-mailbox.c
> index ab24e731a782..17c29e960fbf 100644
> --- a/drivers/mailbox/hi3660-mailbox.c
> +++ b/drivers/mailbox/hi3660-mailbox.c
> @@ -11,6 +11,7 @@
> #include <linux/iopoll.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/mailbox/hi6220-mailbox.c b/drivers/mailbox/hi6220-mailbox.c
> index 1c73c63598f5..f77741ce42e7 100644
> --- a/drivers/mailbox/hi6220-mailbox.c
> +++ b/drivers/mailbox/hi6220-mailbox.c
> @@ -15,6 +15,7 @@
> #include <linux/kfifo.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
> index 20f2ec880ad6..3ef4dd8adf5d 100644
> --- a/drivers/mailbox/imx-mailbox.c
> +++ b/drivers/mailbox/imx-mailbox.c
> @@ -14,7 +14,8 @@
> #include <linux/kernel.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/suspend.h>
> #include <linux/slab.h>
> diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
> index 162df49654fb..20ee283a04cc 100644
> --- a/drivers/mailbox/mailbox-mpfs.c
> +++ b/drivers/mailbox/mailbox-mpfs.c
> @@ -14,6 +14,7 @@
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/interrupt.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/platform_device.h>
> #include <linux/mailbox_controller.h>
> #include <soc/microchip/mpfs.h>
> diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
> index adf36c05fa43..ebff3baf3045 100644
> --- a/drivers/mailbox/mailbox.c
> +++ b/drivers/mailbox/mailbox.c
> @@ -17,6 +17,7 @@
> #include <linux/bitops.h>
> #include <linux/mailbox_client.h>
> #include <linux/mailbox_controller.h>
> +#include <linux/of.h>
>
> #include "mailbox.h"
>
> diff --git a/drivers/mailbox/mtk-adsp-mailbox.c b/drivers/mailbox/mtk-adsp-mailbox.c
> index 14bc0057de81..91487aa4d7da 100644
> --- a/drivers/mailbox/mtk-adsp-mailbox.c
> +++ b/drivers/mailbox/mtk-adsp-mailbox.c
> @@ -10,7 +10,8 @@
> #include <linux/kernel.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> #include <linux/slab.h>
>
> struct mtk_adsp_mbox_priv {
> diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
> index b18d47ea13a0..4d62b07c1411 100644
> --- a/drivers/mailbox/mtk-cmdq-mailbox.c
> +++ b/drivers/mailbox/mtk-cmdq-mailbox.c
> @@ -15,7 +15,7 @@
> #include <linux/platform_device.h>
> #include <linux/mailbox_controller.h>
> #include <linux/mailbox/mtk-cmdq-mailbox.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
>
> #define CMDQ_OP_CODE_MASK (0xff << CMDQ_OP_CODE_SHIFT)
> #define CMDQ_NUM_CMD(t) (t->cmd_buf_size / CMDQ_INST_SIZE)
> diff --git a/drivers/mailbox/omap-mailbox.c b/drivers/mailbox/omap-mailbox.c
> index fa2ce3246b70..792bcaebbc9b 100644
> --- a/drivers/mailbox/omap-mailbox.c
> +++ b/drivers/mailbox/omap-mailbox.c
> @@ -16,7 +16,7 @@
> #include <linux/kfifo.h>
> #include <linux/err.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/omap-mailbox.h>
> diff --git a/drivers/mailbox/platform_mhu.c b/drivers/mailbox/platform_mhu.c
> index a5922ac0b0bf..54161303a36b 100644
> --- a/drivers/mailbox/platform_mhu.c
> +++ b/drivers/mailbox/platform_mhu.c
> @@ -15,6 +15,7 @@
> #include <linux/slab.h>
> #include <linux/err.h>
> #include <linux/io.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/mailbox_controller.h>
> diff --git a/drivers/mailbox/rockchip-mailbox.c b/drivers/mailbox/rockchip-mailbox.c
> index 116286ecc5a0..10c7bee2a915 100644
> --- a/drivers/mailbox/rockchip-mailbox.c
> +++ b/drivers/mailbox/rockchip-mailbox.c
> @@ -8,8 +8,8 @@
> #include <linux/io.h>
> #include <linux/kernel.h>
> #include <linux/mailbox_controller.h>
> +#include <linux/of.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
>
> #define MAILBOX_A2B_INTEN 0x00
> diff --git a/drivers/mailbox/sprd-mailbox.c b/drivers/mailbox/sprd-mailbox.c
> index e3c899abeed8..9ae57de77d4d 100644
> --- a/drivers/mailbox/sprd-mailbox.c
> +++ b/drivers/mailbox/sprd-mailbox.c
> @@ -11,7 +11,7 @@
> #include <linux/io.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/clk.h>
>
> diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
> index 15d538fe2113..4ad3653f3866 100644
> --- a/drivers/mailbox/stm32-ipcc.c
> +++ b/drivers/mailbox/stm32-ipcc.c
> @@ -11,6 +11,7 @@
> #include <linux/io.h>
> #include <linux/mailbox_controller.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/pm_wakeirq.h>
>
> diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
> index 7f98e7436d94..c87c2b900b64 100644
> --- a/drivers/mailbox/tegra-hsp.c
> +++ b/drivers/mailbox/tegra-hsp.c
> @@ -8,7 +8,6 @@
> #include <linux/io.h>
> #include <linux/mailbox_controller.h>
> #include <linux/of.h>
> -#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm.h>
> #include <linux/slab.h>
> diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
> index d097f45b0e5f..e4fcac97dbfa 100644
> --- a/drivers/mailbox/zynqmp-ipi-mailbox.c
> +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
> @@ -16,8 +16,6 @@
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> -#include <linux/of_device.h>
> -#include <linux/of_irq.h>
> #include <linux/platform_device.h>
>
> /* IPI agent ID any */
> --
> 2.40.1
>
