Skip to contentSkip to conversation

ufs: Explicitly include correct DT includes

PATCH Applied Rob Herring 3 participants 4 messages Jul 14, 2023 – Jul 26, 2023

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

PATCH 1/1 ufs: 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/ufs/host/ufs-mediatek.c | 1 +
 drivers/ufs/host/ufs-renesas.c  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/ufs/host/ufs-mediatek.c +1 -0
index e68b05976f9e..aceb3747f7b8 100644
@@ -14,6 +14,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/pm_qos.h>
drivers/ufs/host/ufs-renesas.c +1 -1
index f8a5e79ed3b4..49f7bafc7d55 100644
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <ufs/ufshcd.h>
 
Signature · 1 line
2.40.1
maintainer Acked-by on v1 1/1
#1 lore raw

Hi Rob,

Quoted 13 lines

From: Rob Herring, Sent: Saturday, July 15, 2023 2:50 AM

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.

---

...

Quoted 1 line
 drivers/ufs/host/ufs-renesas.c  | 2 +-

Thank you for the patch! About this renesas related file:

Best regards,
Yoshihiro Shimoda

Quoted 29 lines
 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/ufs/host/ufs-mediatek.c +1 -0
index e68b05976f9e..aceb3747f7b8 100644
@@ -14,6 +14,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/pm_qos.h>
drivers/ufs/host/ufs-renesas.c +1 -2
index f8a5e79ed3b4..49f7bafc7d55 100644
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <ufs/ufshcd.h>
 
--

2.40.1

#2 lore raw
In reply to Rob Herring

Rob,

Quoted 8 lines

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.

Applied to 6.6/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#3 lore raw
In reply to Rob Herring
Quoted 10 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.

[...]

Applied to 6.6/scsi-queue, thanks!

[1/1] ufs: Explicitly include correct DT includes

      https://git.kernel.org/mkp/scsi/c/c2ab666072bc
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering