diff mbox series

soc: starfive: Explicitly include correct DT includes

Message ID 20230714175149.4068174-1-robh@kernel.org
State New
Headers
Series soc: starfive: Explicitly include correct DT includes |

Commit Message

Rob Herring July 14, 2023, 5:51 p.m. UTC 
  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 <robh@kernel.org>
---
 drivers/soc/starfive/jh71xx_pmu.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Walker Chen July 20, 2023, 6:12 a.m. UTC | #1 
On 2023/7/15 1:51, 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.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  drivers/soc/starfive/jh71xx_pmu.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/soc/starfive/jh71xx_pmu.c b/drivers/soc/starfive/jh71xx_pmu.c
> index 7d5f50d71c0d..d3b78a619d40 100644
> --- a/drivers/soc/starfive/jh71xx_pmu.c
> +++ b/drivers/soc/starfive/jh71xx_pmu.c
> @@ -10,7 +10,6 @@
>  #include <linux/iopoll.h>
>  #include <linux/module.h>
>  #include <linux/of.h>
> -#include <linux/of_device.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_domain.h>
>  #include <dt-bindings/power/starfive,jh7110-pmu.h>

Nice! Thank you for your careful discovery, this helps simplify the code.

Best regards,
Walker
Conor Dooley July 20, 2023, 7:12 a.m. UTC | #2 
On Thu, Jul 20, 2023 at 02:12:51PM +0800, Walker Chen wrote:
> On 2023/7/15 1:51, 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.
> > 
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> >  drivers/soc/starfive/jh71xx_pmu.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/drivers/soc/starfive/jh71xx_pmu.c b/drivers/soc/starfive/jh71xx_pmu.c
> > index 7d5f50d71c0d..d3b78a619d40 100644
> > --- a/drivers/soc/starfive/jh71xx_pmu.c
> > +++ b/drivers/soc/starfive/jh71xx_pmu.c
> > @@ -10,7 +10,6 @@
> >  #include <linux/iopoll.h>
> >  #include <linux/module.h>
> >  #include <linux/of.h>
> > -#include <linux/of_device.h>
> >  #include <linux/platform_device.h>
> >  #include <linux/pm_domain.h>
> >  #include <dt-bindings/power/starfive,jh7110-pmu.h>
> 
> Nice! Thank you for your careful discovery, this helps simplify the code.

Huh, seems I missed this patch. Now applied, thanks!
diff mbox series

Patch

diff --git a/drivers/soc/starfive/jh71xx_pmu.c b/drivers/soc/starfive/jh71xx_pmu.c
index 7d5f50d71c0d..d3b78a619d40 100644
--- a/drivers/soc/starfive/jh71xx_pmu.c
+++ b/drivers/soc/starfive/jh71xx_pmu.c
@@ -10,7 +10,6 @@ 
 #include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <dt-bindings/power/starfive,jh7110-pmu.h>