| Message ID | 20230717225414.3210914-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 544885aa07504fdffaf5a467b9dd8bde80d628dd |
| Headers | show |
| Series | ARM: spear: Explicitly include correct DT includes | expand |
On 17-07-23, 16:54, Rob Herring wrote: > 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> > --- > arch/arm/mach-spear/spear1340.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c > index a391f154eff9..70986ef6c877 100644 > --- a/arch/arm/mach-spear/spear1340.c > +++ b/arch/arm/mach-spear/spear1340.c > @@ -10,7 +10,7 @@ > > #define pr_fmt(fmt) "SPEAr1340: " fmt > > -#include <linux/of_platform.h> > +#include <linux/platform_device.h> > #include <asm/mach/arch.h> > #include "generic.h" Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Hello: This patch was applied to soc/soc.git (for-next) by Arnd Bergmann <arnd@arndb.de>: On Mon, 17 Jul 2023 16:54:13 -0600 you wrote: > 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. > > [...] Here is the summary with links: - ARM: spear: Explicitly include correct DT includes https://git.kernel.org/soc/soc/c/544885aa0750 You are awesome, thank you!
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index a391f154eff9..70986ef6c877 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c @@ -10,7 +10,7 @@ #define pr_fmt(fmt) "SPEAr1340: " fmt -#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/mach/arch.h> #include "generic.h"
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> --- arch/arm/mach-spear/spear1340.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)