Skip to contentSkip to conversation

MIPS: More explicit DT include clean-ups

PATCH Applied Rob Herring 2 participants 2 messages Jul 27, 2023 – Jul 28, 2023

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

PATCH 1/1 MIPS: More explicit DT include clean-ups

A couple more clean-ups in the MIPS code.

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.

---
I've now built all MIPS defconfigs in my tree which removes the implicit includes. So I found a few more fixes. This can be squashed into the previous commit if desired.

---
 arch/mips/cavium-octeon/octeon-platform.c | 2 ++
 arch/mips/cavium-octeon/octeon-usb.c      | 2 ++
 arch/mips/ralink/ill_acc.c                | 2 ++
 3 files changed, 6 insertions(+)
arch/mips/cavium-octeon/octeon-platform.c +2 -0
index ce05c0dd3acd..60da1b2091f5 100644
@@ -8,8 +8,10 @@
  */
 
 #include <linux/etherdevice.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_fdt.h>
+#include <linux/platform_device.h>
 #include <linux/libfdt.h>
 
 #include <asm/octeon/octeon.h>
arch/mips/cavium-octeon/octeon-usb.c +2 -0
index 2add435ad038..add0f23592b3 100644
@@ -15,7 +15,9 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/platform_device.h>
 
 /*
  * USB Control Register
arch/mips/ralink/ill_acc.c +2 -0
index f395ae218470..25341b2319d0 100644
@@ -5,8 +5,10 @@
  */
 
 #include <linux/interrupt.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_irq.h>
+#include <linux/platform_device.h>
 
 #include <asm/mach-ralink/ralink_regs.h>
 
Signature · 1 line
2.40.1
maintainer Applied
#1 lore raw
Quoted 16 lines · Rob Herring

A couple more clean-ups in the MIPS code.

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.

---
I've now built all MIPS defconfigs in my tree which removes the implicit includes. So I found a few more fixes. This can be squashed into the previous commit if desired.

Quoted 5 lines
---
 arch/mips/cavium-octeon/octeon-platform.c | 2 ++
 arch/mips/cavium-octeon/octeon-usb.c      | 2 ++
 arch/mips/ralink/ill_acc.c                | 2 ++
 3 files changed, 6 insertions(+)

applied to mips-next.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]