diff mbox series

pci: rcar-gen4: Replace of_device.h with explicit of.h include

Message ID 20231207165251.2855783-1-robh@kernel.org (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show
Series pci: rcar-gen4: Replace of_device.h with explicit of.h include | expand

Commit Message

Rob Herring (Arm) Dec. 7, 2023, 4:52 p.m. UTC
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.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Krzysztof Wilczyński Dec. 14, 2023, 1:33 a.m. UTC | #1
Hello,

> 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.

Applied to controller/rcar, thank you!

[1/1] PCI: rcar-gen4: Replace of_device.h with explicit of.h include
      https://git.kernel.org/pci/pci/c/263714f5fcf8

	Krzysztof
Yoshihiro Shimoda Dec. 14, 2023, 2:28 a.m. UTC | #2
Hello,

> From: Krzysztof Wilczyński, Sent: Thursday, December 14, 2023 10:33 AM
> 
> Hello,
> 
> > 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.
> 
> Applied to controller/rcar, thank you!
> 
> [1/1] PCI: rcar-gen4: Replace of_device.h with explicit of.h include
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?id=263714f5fcf8

Thank you! I completely overlooked this patch. Maybe it's too late, but I also reviewed this patch, so

Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

It's up to you whether my tag is added to the commit or not :)

Best regards,
Yoshihiro Shimoda

> 	Krzysztof
Krzysztof Wilczyński Dec. 14, 2023, 7:22 p.m. UTC | #3
Hello,

> > > 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.
> > 
> > Applied to controller/rcar, thank you!
> > 
> > [1/1] PCI: rcar-gen4: Replace of_device.h with explicit of.h include
> > 
> > https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?id=263714f5fcf8
> 
> Thank you! I completely overlooked this patch. Maybe it's too late, but I also reviewed this patch, so
> 
> Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
> It's up to you whether my tag is added to the commit or not :)

No worries.  Never too late for a good review. :)

As such, I added your Reviewed-by, so it should be there, per:

  https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=controller/rcar&id=ec215237480478ca5523ea12f58803d9b7a8a0ea

	Krzysztof
diff mbox series

Patch

diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
index 3bc45e513b3d..2ca5b7983d62 100644
--- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
+++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@ -8,7 +8,7 @@ 
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>