arm64: Explicitly include correct DT includes
PATCH 1/1 arm64: 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.
--- arch/arm64/kernel/cpuidle.c | 2 -- arch/arm64/kernel/pci.c | 2 -- 2 files changed, 4 deletions(-)
arch/arm64/kernel/cpuidle.c +0 -2
@@ -9,8 +9,6 @@#include <linux/acpi.h> #include <linux/cpuidle.h> #include <linux/cpu_pm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <linux/psci.h> #ifdef CONFIG_ACPI_PROCESSOR_IDLE
arch/arm64/kernel/pci.c +0 -2
@@ -11,8 +11,6 @@#include <linux/io.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/of_pci.h> -#include <linux/of_platform.h> #include <linux/pci.h> #include <linux/pci-acpi.h> #include <linux/pci-ecam.h>
Signature · 1 line
2.40.1
Will Deacon
maintainerQuoted 20 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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]>--- arch/arm64/kernel/cpuidle.c | 2 -- arch/arm64/kernel/pci.c | 2 -- 2 files changed, 4 deletions(-)arch/arm64/kernel/cpuidle.c +0
-0
arch/arm64/kernel/cpuidle.c line 12
Quoted 6 lines
arch/arm64/kernel/cpuidle.c +0
-2@@ -9,8 +9,6 @@#include <linux/acpi.h> #include <linux/cpuidle.h> #include <linux/cpu_pm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <linux/psci.h>
I don't grok how dropping 'linux/of.h' follows from the commit message. Is it simply not needed by this file?
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 17 lines · Will Deacon
Quoted 15 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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]>--- arch/arm64/kernel/cpuidle.c | 2 -- arch/arm64/kernel/pci.c | 2 -- 2 files changed, 4 deletions(-)
Quoted 14 lines
arch/arm64/kernel/cpuidle.c line 12
Quoted 11 lines
arch/arm64/kernel/cpuidle.c +0
-2@@ -9,8 +9,6 @@#include <linux/acpi.h> #include <linux/cpuidle.h> #include <linux/cpu_pm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <linux/psci.h> I don't grok how dropping '
linux/of.h' follows from the commit message. Is it simply not needed by this file?
The motivation is to disentangle of_device.h includes. The fix is making sure the explicit DT includes match what is used. The result varies and here none of the DT headers are needed.
Rob
Quoted 10 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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 to arm64 (for-next/misc), thanks!
[1/1] arm64: Explicitly include correct DT includes
https://git.kernel.org/arm64/c/b9d601249740
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev