| Message ID | 20230803-dt-header-cleanups-for-soc-v2-21-d8de2cc88bff@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | adedd5d129b1f00f03c0a8486d228d27ba8e323e |
| Headers | show |
| Series | ARM: DT include cleanups | expand |
Dne petek, 04. avgust 2023 ob 00:43:01 CEST je Rob Herring napisal(a): > 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> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Should I take this through sunxi tree? Best regards, Jernej > --- > v2: > - Drop sun20i-ppu.c which moved > --- > drivers/soc/sunxi/sunxi_sram.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c > index 4c4864cd2342..4458b2e0562b 100644 > --- a/drivers/soc/sunxi/sunxi_sram.c > +++ b/drivers/soc/sunxi/sunxi_sram.c > @@ -15,7 +15,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_address.h> > -#include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/regmap.h>
Dne petek, 04. avgust 2023 ob 00:43:01 CEST je Rob Herring napisal(a): > 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> Applied to sunxi tree, thanks! Best regards, Jernej > --- > v2: > - Drop sun20i-ppu.c which moved > --- > drivers/soc/sunxi/sunxi_sram.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c > index 4c4864cd2342..4458b2e0562b 100644 > --- a/drivers/soc/sunxi/sunxi_sram.c > +++ b/drivers/soc/sunxi/sunxi_sram.c > @@ -15,7 +15,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_address.h> > -#include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/regmap.h>
On Sun, Aug 6, 2023 at 6:42 AM Jernej Škrabec <jernej.skrabec@gmail.com> wrote: > > Dne petek, 04. avgust 2023 ob 00:43:01 CEST je Rob Herring napisal(a): > > 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> > > Applied to sunxi tree, thanks! Did you really? Doesn't look like this is in linux-next. Rob
On Tue, Aug 22, 2023 at 5:30 PM Rob Herring <robh@kernel.org> wrote: > > On Sun, Aug 6, 2023 at 6:42 AM Jernej Škrabec <jernej.skrabec@gmail.com> wrote: > > > > Dne petek, 04. avgust 2023 ob 00:43:01 CEST je Rob Herring napisal(a): > > > 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> > > > > Applied to sunxi tree, thanks! > > Did you really? Doesn't look like this is in linux-next. Sorry, it's just the genpd part that isn't since that moved. Rob
diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 4c4864cd2342..4458b2e0562b 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -15,7 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/regmap.h>
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> --- v2: - Drop sun20i-ppu.c which moved --- drivers/soc/sunxi/sunxi_sram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)