mailbox: Explicitly include correct DT includes
Subsystems (10)
PATCH 1/1 mailbox: 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/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(-)
drivers/mailbox/arm_mhu.c +1 -0
@@ -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
drivers/mailbox/arm_mhu_db.c +0 -1
@@ -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
drivers/mailbox/hi3660-mailbox.c +1 -0
@@ -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>
drivers/mailbox/hi6220-mailbox.c +1 -0
@@ -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>
drivers/mailbox/imx-mailbox.c +2 -1
@@ -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>
drivers/mailbox/mailbox-mpfs.c +1 -0
@@ -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>
drivers/mailbox/mailbox.c +1 -0
@@ -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"
drivers/mailbox/mtk-adsp-mailbox.c +2 -1
@@ -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 {
drivers/mailbox/mtk-cmdq-mailbox.c +1 -1
@@ -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)
drivers/mailbox/omap-mailbox.c +1 -1
@@ -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>
drivers/mailbox/platform_mhu.c +1 -0
@@ -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>
drivers/mailbox/rockchip-mailbox.c +1 -1
@@ -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
drivers/mailbox/sprd-mailbox.c +1 -1
@@ -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>
drivers/mailbox/stm32-ipcc.c +1 -0
@@ -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>
drivers/mailbox/tegra-hsp.c +0 -1
@@ -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>
drivers/mailbox/zynqmp-ipi-mailbox.c +0 -2
@@ -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 */
Signature · 7 lines
2.40.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 21 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]>--- 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 +-
Quoted 8 lines
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!
Quoted 206 lines
drivers/mailbox/arm_mhu.c +1
-0@@ -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 0x8drivers/mailbox/arm_mhu_db.c +0
-1@@ -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 0x8drivers/mailbox/hi3660-mailbox.c +1
-0@@ -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> drivers/mailbox/hi6220-mailbox.c +1
-0@@ -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> drivers/mailbox/imx-mailbox.c +2
-1@@ -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> drivers/mailbox/mailbox-mpfs.c +1
-0@@ -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> drivers/mailbox/mailbox.c +1
-0@@ -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" drivers/mailbox/mtk-adsp-mailbox.c +2
-1@@ -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 {drivers/mailbox/mtk-cmdq-mailbox.c +1
-1@@ -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)drivers/mailbox/omap-mailbox.c +1
-1@@ -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> drivers/mailbox/platform_mhu.c +1
-0@@ -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> drivers/mailbox/rockchip-mailbox.c +1
-1@@ -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 0x00drivers/mailbox/sprd-mailbox.c +1
-1@@ -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> drivers/mailbox/stm32-ipcc.c +1
-0@@ -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> drivers/mailbox/tegra-hsp.c +0
-1@@ -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> drivers/mailbox/zynqmp-ipi-mailbox.c +0
-3@@ -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
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.
Quoted 2 lines
Signed-off-by Rob Herring <[email protected]>
I thought I was to pick the patch. But I see you intend to do it. Np.
thanks
Quoted 12 lines · Jassi Brar
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.
Quoted 3 lines
Quoted 2 lines
Signed-off-by Rob Herring <[email protected]>I thought I was to pick the patch. But I see you intend to do it. Np.
No, please apply it.
Thanks,
Rob
Quoted 4 lines
Acked-by Jassi Brar <[email protected]>thanks