drivers/perf: Explicitly include correct DT includes
Subsystems (5)
PATCH 1/1 drivers/perf: 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.
--- drivers/perf/amlogic/meson_ddr_pmu_core.c | 2 -- drivers/perf/arm-cci.c | 5 +---- drivers/perf/arm_dsu_pmu.c | 2 +- drivers/perf/arm_pmu_platform.c | 1 - drivers/perf/arm_spe_pmu.c | 3 +-- drivers/perf/fsl_imx8_ddr_perf.c | 3 +-- drivers/perf/fsl_imx9_ddr_perf.c | 4 +--- drivers/perf/marvell_cn10k_ddr_pmu.c | 3 +-- drivers/perf/marvell_cn10k_tad_pmu.c | 3 +-- 9 files changed, 7 insertions(+), 19 deletions(-)
drivers/perf/amlogic/meson_ddr_pmu_core.c +0 -2
@@ -9,8 +9,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> -#include <linux/of_irq.h> #include <linux/perf_event.h> #include <linux/platform_device.h> #include <linux/printk.h>
drivers/perf/arm-cci.c +1 -4
@@ -7,10 +7,7 @@#include <linux/io.h> #include <linux/interrupt.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_device.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/perf_event.h> #include <linux/platform_device.h> #include <linux/slab.h>
drivers/perf/arm_dsu_pmu.c +1 -1
@@ -20,7 +20,7 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/perf_event.h> #include <linux/platform_device.h> #include <linux/spinlock.h>
drivers/perf/arm_pmu_platform.c +0 -1
@@ -16,7 +16,6 @@#include <linux/irqdesc.h> #include <linux/kconfig.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/percpu.h> #include <linux/perf/arm_pmu.h> #include <linux/platform_device.h>
drivers/perf/arm_spe_pmu.c +1 -2
@@ -25,8 +25,7 @@#include <linux/kernel.h> #include <linux/list.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/perf_event.h> #include <linux/perf/arm_pmu.h> #include <linux/platform_device.h>
drivers/perf/fsl_imx8_ddr_perf.c +1 -2
@@ -10,10 +10,9 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/perf_event.h> +#include <linux/platform_device.h> #include <linux/slab.h> #define COUNTER_CNTL 0x0
drivers/perf/fsl_imx9_ddr_perf.c +1 -3
@@ -7,9 +7,7 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_device.h> -#include <linux/of_irq.h> +#include <linux/platform_device.h> #include <linux/perf_event.h> /* Performance monitor configuration */
drivers/perf/marvell_cn10k_ddr_pmu.c +1 -2
@@ -8,11 +8,10 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_device.h> #include <linux/perf_event.h> #include <linux/hrtimer.h> #include <linux/acpi.h> +#include <linux/platform_device.h> /* Performance Counters Operating Mode Control Registers */ #define DDRC_PERF_CNT_OP_MODE_CTRL 0x8020
drivers/perf/marvell_cn10k_tad_pmu.c +1 -2
@@ -6,10 +6,9 @@#define pr_fmt (fmt) "tad_pmu: " fmt +#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_device.h> #include <linux/cpuhotplug.h> #include <linux/perf_event.h> #include <linux/platform_device.h>
Signature · 7 lines
2.40.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
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 will (for-next/perf), thanks!
[1/1] drivers/perf: Explicitly include correct DT includes
https://git.kernel.org/will/c/918dc87b746e
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel