linux-kernel - Re: [PATCH] soc: microchip: Explicitly include correct DT includes

Open Source and information security mailing list archives

Date:   Fri, 14 Jul 2023 19:51:27 +0100
From:   Conor Dooley <conor@...nel.org>
To:     Rob Herring <robh@...nel.org>
Cc:     Nicolas Ferre <nicolas.ferre@...rochip.com>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Claudiu Beznea <claudiu.beznea@...rochip.com>,
        Conor Dooley <conor.dooley@...rochip.com>,
        Daire McNamara <daire.mcnamara@...rochip.com>,
        devicetree@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
        linux-kernel@...r.kernel.org, linux-riscv@...ts.infradead.org
Subject: Re: [PATCH] soc: microchip: Explicitly include correct DT includes

On Fri, Jul 14, 2023 at 11:51:38AM -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.
> 
> Signed-off-by: Rob Herring <robh@...nel.org>

Hmm, usually these go to different places. I'll push them both to the
at91 repo.

> ---
>  drivers/soc/atmel/sfr.c                     | 1 -
>  drivers/soc/microchip/mpfs-sys-controller.c | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/soc/atmel/sfr.c b/drivers/soc/atmel/sfr.c
> index 0525eef49d1a..cc94ca1b494c 100644
> --- a/drivers/soc/atmel/sfr.c
> +++ b/drivers/soc/atmel/sfr.c
> @@ -10,7 +10,6 @@
>  #include <linux/nvmem-provider.h>
>  #include <linux/random.h>
>  #include <linux/of.h>
> -#include <linux/of_device.h>
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
>  
> diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c
> index 216d9f4ea0ce..fbcd5fd24d7c 100644
> --- a/drivers/soc/microchip/mpfs-sys-controller.c
> +++ b/drivers/soc/microchip/mpfs-sys-controller.c
> @@ -13,7 +13,7 @@
>  #include <linux/module.h>
>  #include <linux/jiffies.h>
>  #include <linux/interrupt.h>
> -#include <linux/of_platform.h>
> +#include <linux/of.h>
>  #include <linux/mailbox_client.h>
>  #include <linux/platform_device.h>
>  #include <soc/microchip/mpfs.h>
> -- 
> 2.40.1
> 
> 
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives