Skip to contentSkip to conversation

hwtracing: coresight: Explicitly include correct DT includes

PATCH In review Rob Herring 2 participants 2 messages Jul 14, 2023 – Jul 17, 2023

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

PATCH 1/1 hwtracing: coresight: 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/hwtracing/coresight/coresight-core.c     | 2 +-
 drivers/hwtracing/coresight/coresight-platform.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-core.c +1 -1
index 118fcf27854d..9fabe00a40d6 100644
@@ -17,7 +17,7 @@
 #include <linux/mutex.h>
 #include <linux/clk.h>
 #include <linux/coresight.h>
-#include <linux/of_platform.h>
+#include <linux/property.h>
 #include <linux/delay.h>
 #include <linux/pm_runtime.h>
 
drivers/hwtracing/coresight/coresight-platform.c +1 -2
index 3e2e135cb8f6..d94b0e77bcfc 100644
@@ -9,9 +9,8 @@
 #include <linux/slab.h>
 #include <linux/clk.h>
 #include <linux/of.h>
-#include <linux/of_address.h>
+#include <linux/of.h>
 #include <linux/of_graph.h>
-#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
 #include <linux/coresight.h>
Signature · 7 lines
2.40.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#1 lore raw

Hi Rob

Thanks for the cleanup. Please find my comments below.

Quoted 20 lines · Rob Herring

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/hwtracing/coresight/coresight-core.c     | 2 +-
  drivers/hwtracing/coresight/coresight-platform.c | 3 +--
  2 files changed, 2 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-core.c +0 -0
index 118fcf27854d..9fabe00a40d6 100644

drivers/hwtracing/coresight/coresight-core.c line 22

Quoted 7 lines
drivers/hwtracing/coresight/coresight-core.c +1 -1
@@ -17,7 +17,7 @@
  #include <linux/mutex.h>
  #include <linux/clk.h>
  #include <linux/coresight.h>
-#include <linux/of_platform.h>
+#include <linux/property.h>
  #include <linux/delay.h>
  #include <linux/pm_runtime.h>

This looks correct to me.

drivers/hwtracing/coresight/coresight-platform.c line 12

Quoted 11 lines
drivers/hwtracing/coresight/coresight-platform.c +1 -1
index 3e2e135cb8f6..d94b0e77bcfc 100644
@@ -9,9 +9,8 @@
  #include <linux/slab.h>
  #include <linux/clk.h>
  #include <linux/of.h>
-#include <linux/of_address.h>
+#include <linux/of.h>

We already include of.h two lines above, so we could skip this.

drivers/hwtracing/coresight/coresight-platform.c line 16

Quoted 5 lines
drivers/hwtracing/coresight/coresight-platform.c +0 -1
  #include <linux/of_graph.h>
-#include <linux/of_platform.h>
  #include <linux/platform_device.h>
  #include <linux/amba/bus.h>
  #include <linux/coresight.h>

Suzuki