[SRU] [jammy:linux-xilinx-zynqmp 3/4] w1: amd_axi_w1: Explicitly include correct DT includes

Portia Stephens portia.stephens at canonical.com
Tue Apr 2 02:59:10 UTC 2024


From: Rob Herring <robh at kernel.org>

BugLink: https://bugs.launchpad.net/bugs/2058707

The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it was 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 at kernel.org>
Link: https://lore.kernel.org/r/20231207163318.2727816-1-robh@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
(cherry picked from commit efc19c44aa442197ddcbb157c6ca54a56eba8c4e)
Signed-off-by: Portia Stephens <portia.stephens at canonical.com>
---
 drivers/w1/masters/amd_axi_w1.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/w1/masters/amd_axi_w1.c b/drivers/w1/masters/amd_axi_w1.c
index 24a05c2de5f1..4d3a68ca9263 100644
--- a/drivers/w1/masters/amd_axi_w1.c
+++ b/drivers/w1/masters/amd_axi_w1.c
@@ -12,8 +12,9 @@
 #include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of_platform.h>
+#include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/wait.h>
 
-- 
2.34.1




More information about the kernel-team mailing list