Skip to content

Commit 918dc87

Browse files
robherringwilldeacon
authored andcommitted
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. Signed-off-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20230714174832.4061752-1-robh@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
1 parent 989567f commit 918dc87

9 files changed

Lines changed: 7 additions & 19 deletions

drivers/perf/amlogic/meson_ddr_pmu_core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#include <linux/kernel.h>
1010
#include <linux/module.h>
1111
#include <linux/of.h>
12-
#include <linux/of_device.h>
13-
#include <linux/of_irq.h>
1412
#include <linux/perf_event.h>
1513
#include <linux/platform_device.h>
1614
#include <linux/printk.h>

drivers/perf/arm-cci.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
#include <linux/io.h>
88
#include <linux/interrupt.h>
99
#include <linux/module.h>
10-
#include <linux/of_address.h>
11-
#include <linux/of_device.h>
12-
#include <linux/of_irq.h>
13-
#include <linux/of_platform.h>
10+
#include <linux/of.h>
1411
#include <linux/perf_event.h>
1512
#include <linux/platform_device.h>
1613
#include <linux/slab.h>

drivers/perf/arm_dsu_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/interrupt.h>
2121
#include <linux/kernel.h>
2222
#include <linux/module.h>
23-
#include <linux/of_device.h>
23+
#include <linux/of.h>
2424
#include <linux/perf_event.h>
2525
#include <linux/platform_device.h>
2626
#include <linux/spinlock.h>

drivers/perf/arm_pmu_platform.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/irqdesc.h>
1717
#include <linux/kconfig.h>
1818
#include <linux/of.h>
19-
#include <linux/of_device.h>
2019
#include <linux/percpu.h>
2120
#include <linux/perf/arm_pmu.h>
2221
#include <linux/platform_device.h>

drivers/perf/arm_spe_pmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
#include <linux/kernel.h>
2626
#include <linux/list.h>
2727
#include <linux/module.h>
28-
#include <linux/of_address.h>
29-
#include <linux/of_device.h>
28+
#include <linux/of.h>
3029
#include <linux/perf_event.h>
3130
#include <linux/perf/arm_pmu.h>
3231
#include <linux/platform_device.h>

drivers/perf/fsl_imx8_ddr_perf.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
#include <linux/io.h>
1111
#include <linux/module.h>
1212
#include <linux/of.h>
13-
#include <linux/of_address.h>
14-
#include <linux/of_device.h>
1513
#include <linux/of_irq.h>
1614
#include <linux/perf_event.h>
15+
#include <linux/platform_device.h>
1716
#include <linux/slab.h>
1817

1918
#define COUNTER_CNTL 0x0

drivers/perf/fsl_imx9_ddr_perf.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include <linux/io.h>
88
#include <linux/module.h>
99
#include <linux/of.h>
10-
#include <linux/of_address.h>
11-
#include <linux/of_device.h>
12-
#include <linux/of_irq.h>
10+
#include <linux/platform_device.h>
1311
#include <linux/perf_event.h>
1412

1513
/* Performance monitor configuration */

drivers/perf/marvell_cn10k_ddr_pmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
#include <linux/io.h>
99
#include <linux/module.h>
1010
#include <linux/of.h>
11-
#include <linux/of_address.h>
12-
#include <linux/of_device.h>
1311
#include <linux/perf_event.h>
1412
#include <linux/hrtimer.h>
1513
#include <linux/acpi.h>
14+
#include <linux/platform_device.h>
1615

1716
/* Performance Counters Operating Mode Control Registers */
1817
#define DDRC_PERF_CNT_OP_MODE_CTRL 0x8020

drivers/perf/marvell_cn10k_tad_pmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77
#define pr_fmt(fmt) "tad_pmu: " fmt
88

9+
#include <linux/io.h>
910
#include <linux/module.h>
1011
#include <linux/of.h>
11-
#include <linux/of_address.h>
12-
#include <linux/of_device.h>
1312
#include <linux/cpuhotplug.h>
1413
#include <linux/perf_event.h>
1514
#include <linux/platform_device.h>

0 commit comments

Comments
 (0)