Skip to contentSkip to conversation

soc: starfive: Explicitly include correct DT includes

PATCH In review Rob Herring 3 participants 3 messages Jul 14, 2023 – Jul 20, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: starfive: 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/soc/starfive/jh71xx_pmu.c | 1 -
 1 file changed, 1 deletion(-)
drivers/soc/starfive/jh71xx_pmu.c +0 -1
index 7d5f50d71c0d..d3b78a619d40 100644
@@ -10,7 +10,6 @@
 #include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <dt-bindings/power/starfive,jh7110-pmu.h>
Signature · 1 line
2.40.1
#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 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/soc/starfive/jh71xx_pmu.c | 1 -
 1 file changed, 1 deletion(-)
drivers/soc/starfive/jh71xx_pmu.c +0 -0
index 7d5f50d71c0d..d3b78a619d40 100644

drivers/soc/starfive/jh71xx_pmu.c line 15

Quoted 7 lines
drivers/soc/starfive/jh71xx_pmu.c +0 -1
@@ -10,7 +10,6 @@
 #include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <dt-bindings/power/starfive,jh7110-pmu.h>

Nice! Thank you for your careful discovery, this helps simplify the code.

Best regards,
Walker

#2 lore raw
Quoted 15 lines · Walker Chen
Quoted 14 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/soc/starfive/jh71xx_pmu.c | 1 -
 1 file changed, 1 deletion(-)
Quoted 14 lines

drivers/soc/starfive/jh71xx_pmu.c line 15

Quoted 12 lines
drivers/soc/starfive/jh71xx_pmu.c +0 -1
index 7d5f50d71c0d..d3b78a619d40 100644
@@ -10,7 +10,6 @@
 #include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <dt-bindings/power/starfive,jh7110-pmu.h>

Nice! Thank you for your careful discovery, this helps simplify the code.

Huh, seems I missed this patch. Now applied, thanks!