Skip to contentSkip to conversation

ARM: zynq: Explicitly include correct DT includes

PATCH Applied Rob Herring 2 participants 2 messages Jul 17, 2023 – Jul 20, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: zynq: 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 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.

---
 arch/arm/mach-zynq/pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-zynq/pm.c +1 -1
index 8ba450ab559c..61ad965ef3ac 100644
@@ -8,8 +8,8 @@
  */
 
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_device.h>
 #include "common.h"
 
 /* register offsets */
Signature · 1 line
2.40.1
maintainer Applied
#1 lore raw
Quoted 19 lines · Rob Herring

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.

---
  arch/arm/mach-zynq/pm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-zynq/pm.c +0 -0
index 8ba450ab559c..61ad965ef3ac 100644

arch/arm/mach-zynq/pm.c line 15

Quoted 9 lines
arch/arm/mach-zynq/pm.c +1 -1
@@ -8,8 +8,8 @@
   */
 
  #include <linux/io.h>
+#include <linux/of.h>
  #include <linux/of_address.h>
-#include <linux/of_device.h>
  #include "common.h"
 
  /* register offsets */

Applied.
M