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@kernel.org>
---
 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.42.0

On Thu, 07 Dec 2023 10:33:18 -0600, Rob Herring wrote:
> 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.
> 
> [...]

Applied, thanks!

[1/1] w1: amd_axi_w1: Explicitly include correct DT includes
      https://git.kernel.org/krzk/linux-w1/c/efc19c44aa442197ddcbb157c6ca54a56eba8c4e

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

On 08/12/2023 08:10, Krzysztof Kozlowski wrote:

> Applied, thanks!
> 
> [1/1] w1: amd_axi_w1: Explicitly include correct DT includes
>        https://git.kernel.org/krzk/linux-w1/c/efc19c44aa442197ddcbb157c6ca54a56eba8c4e
> 
Thank you Rob and Krzysztof,

I've regression tested this on W1 dual instance hardware running on the 
AMD KR260 development board and it continues to function correctly. 
Small change, but tested nevertheless.

Tested-by: Kris Chaplin <kris.chaplin@amd.com>