diff mbox series

of: Stop circularly including of_device.h and of_platform.h

Message ID 20231129164316.2663565-1-robh@kernel.org
State New
Headers
Series of: Stop circularly including of_device.h and of_platform.h |

Commit Message

Rob Herring Nov. 29, 2023, 4:43 p.m. UTC 
  The DT of_device.h and of_platform.h headers 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. The headers also include
platform_device.h and of.h. The result was lots of drivers relied on
these implicit includes.

Now the entire tree has been fixed over the last couple of cycles to
explicitly include the necessary headers instead of relying on
of_device.h and/or of_platform.h implicit includes, so the implicit and
circular includes can finally be removed.

Signed-off-by: Rob Herring <robh@kernel.org>
---
There are still a few dependencies which have not been applied. If you
are on the To list, one of them applies to you:

https://lore.kernel.org/all/20231122180140.1432025-1-robh@kernel.org/
https://lore.kernel.org/all/20231115210245.3744589-1-robh@kernel.org/
https://lore.kernel.org/all/20231115205828.3732207-1-robh@kernel.org/
https://lore.kernel.org/all/20231115210319.3747145-1-robh@kernel.org/
https://lore.kernel.org/all/20231115210258.3744896-1-robh@kernel.org/
---
 include/linux/of_device.h   | 5 +----
 include/linux/of_platform.h | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 2c7a3d4bc775..b59165b28fd7 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -2,10 +2,7 @@ 
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
 
-#include <linux/platform_device.h>
-#include <linux/of_platform.h> /* temporary until merge */
-
-#include <linux/of.h>
+#include <linux/device/driver.h>
 
 struct device;
 struct of_device_id;
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index fadfea575485..a2ff1ad48f7f 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -7,11 +7,11 @@ 
  */
 
 #include <linux/mod_devicetable.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
 
 struct device;
+struct device_node;
 struct of_device_id;
+struct platform_device;
 
 /**
  * struct of_dev_auxdata - lookup table entry for device names & platform_data