firmware: Explicitly include correct DT includes
Subsystems (7)
PATCH 1/1 firmware: 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/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 - drivers/firmware/tegra/bpmp.c | 3 +-- drivers/firmware/xilinx/zynqmp.c | 1 + 10 files changed, 9 insertions(+), 8 deletions(-)
drivers/firmware/arm_scmi/driver.c +2 -2
@@ -28,8 +28,8 @@#include <linux/hashtable.h> #include <linux/list.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/processor.h> #include <linux/refcount.h> #include <linux/slab.h>
drivers/firmware/imx/imx-dsp.c +0 -1
@@ -10,7 +10,6 @@#include <linux/kernel.h> #include <linux/mailbox_client.h> #include <linux/module.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/slab.h>
drivers/firmware/imx/imx-scu-irq.c +1 -0
@@ -10,6 +10,7 @@#include <linux/firmware/imx/ipc.h> #include <linux/firmware/imx/sci.h> #include <linux/mailbox_client.h> +#include <linux/of.h> #include <linux/suspend.h> #define IMX_SC_IRQ_FUNC_ENABLE 1
drivers/firmware/imx/imx-scu.c +1 -0
@@ -16,6 +16,7 @@#include <linux/mailbox_client.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h>
drivers/firmware/mtk-adsp-ipc.c +0 -1
@@ -8,7 +8,6 @@#include <linux/kernel.h> #include <linux/mailbox_client.h> #include <linux/module.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/slab.h>
drivers/firmware/raspberrypi.c +1 -0
@@ -10,6 +10,7 @@#include <linux/kref.h> #include <linux/mailbox_client.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/slab.h>
drivers/firmware/scpi_pm_domain.c +2 -1
@@ -8,7 +8,8 @@#include <linux/err.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/scpi_protocol.h>
drivers/firmware/stratix10-rsu.c +0 -1
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/firmware/intel/stratix10-svc-client.h> #include <linux/string.h>
drivers/firmware/tegra/bpmp.c +1 -2
@@ -8,8 +8,7 @@#include <linux/mailbox_client.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/semaphore.h>
drivers/firmware/xilinx/zynqmp.c +1 -0
@@ -18,6 +18,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/hashtable.h>
Signature · 1 line
2.40.1
Dinh Nguyen
maintainerQuoted 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 9 lines
--- drivers/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 -
For stratix10-rsu.c, Acked-by: Dinh Nguyen <[email protected]>
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 12 lines
--- drivers/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 - drivers/firmware/tegra/bpmp.c | 3 +-- drivers/firmware/xilinx/zynqmp.c | 1 + 10 files changed, 9 insertions(+), 8 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
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 12 lines
--- drivers/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 - drivers/firmware/tegra/bpmp.c | 3 +-- drivers/firmware/xilinx/zynqmp.c | 1 + 10 files changed, 9 insertions(+), 8 deletions(-)
Not sure about the other maintainers, but I usually pick up firmware/tegra patches up through the Tegra tree and then they ultimately go through ARM SoC.
Arnd, Olof, does it make sense for you guys to pick this up directly?
Thierry
Quoted 24 lines · Thierry Reding
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 12 lines
--- drivers/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 - drivers/firmware/tegra/bpmp.c | 3 +-- drivers/firmware/xilinx/zynqmp.c | 1 + 10 files changed, 9 insertions(+), 8 deletions(-)
Quoted 5 lines
Not sure about the other maintainers, but I usually pick up
firmware/tegrapatches up through the Tegra tree and then they ultimately go through ARM SoC.Arnd, Olof, does it make sense for you guys to pick this up directly?
Sure, I was going to suggest the same thing.
Rob, can you send the patch to [email protected] assuming nobody has objections? Feel free to send this together with the bits for drivers/soc, drivers/bus, arch/arm/mach-*/ and anything else that usually gets merged this way.
Arnd