2023-07-14 17:57:54

by Rob Herring

Subject: [PATCH] i3c: 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.

Signed-off-by: Rob Herring <[email protected]>
---
drivers/i3c/master/ast2600-i3c-master.c | 1 -
drivers/i3c/master/i3c-master-cdns.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/i3c/master/ast2600-i3c-master.c b/drivers/i3c/master/ast2600-i3c-master.c
index 09ed19d489e9..01a47d3dd499 100644
--- a/drivers/i3c/master/ast2600-i3c-master.c
+++ b/drivers/i3c/master/ast2600-i3c-master.c
@@ -8,7 +8,6 @@
#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of.h>
-#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>

diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c
index 01610fa5b0cc..49551db71bc9 100644
--- a/drivers/i3c/master/i3c-master-cdns.c
+++ b/drivers/i3c/master/i3c-master-cdns.c
@@ -22,7 +22,6 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
-#include <linux/of_device.h>

#define DEV_ID 0x0
#define DEV_ID_I3C_MASTER 0x5034
--
2.40.1

2023-07-16 04:26:07

by Jeremy Kerr

Subject: Re: [PATCH] i3c: Explicitly include correct DT includes

Hi Rob,

> In order to detangle these headers and replace the implicit includes
> with struct declarations

This refers to replacing the implicit includes within the of/ subsystem,
right?

> users need to explicitly include the correct includes.

LGTM, thanks!

Reviewed-by: Jeremy Kerr <[email protected]>

Cheers,


Jeremy

2023-07-27 21:48:26

by Alexandre Belloni

Subject: Re: [PATCH] i3c: Explicitly include correct DT includes

On Fri, 14 Jul 2023 11:46:23 -0600, Rob Herring wrote:
> 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, thanks!

[1/1] i3c: Explicitly include correct DT includes
commit: 574ca75f8d2935053872aa1b15d8ba24bfb5e51c

Best regards,

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com