Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf/arm_dmc620: Remove duplicate format attribute #defines

These were copied from the SPE driver, but now they're in the arm_pmu.h
header so delete them and use the header instead.

Signed-off-by: James Clark <james.clark@arm.com>
Link: https://lore.kernel.org/r/20231211161331.1277825-8-james.clark@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

authored by

James Clark and committed by
Will Deacon
a5f4ca68 f6da8696

+1 -21
+1 -21
drivers/perf/arm_dmc620_pmu.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/mutex.h> 25 25 #include <linux/perf_event.h> 26 + #include <linux/perf/arm_pmu.h> 26 27 #include <linux/platform_device.h> 27 28 #include <linux/printk.h> 28 29 #include <linux/rculist.h> ··· 189 188 #define ATTR_CFG_FLD_clkdiv2_CFG config2 190 189 #define ATTR_CFG_FLD_clkdiv2_LO 9 191 190 #define ATTR_CFG_FLD_clkdiv2_HI 9 192 - 193 - #define __GEN_PMU_FORMAT_ATTR(cfg, lo, hi) \ 194 - (lo) == (hi) ? #cfg ":" #lo "\n" : #cfg ":" #lo "-" #hi 195 - 196 - #define _GEN_PMU_FORMAT_ATTR(cfg, lo, hi) \ 197 - __GEN_PMU_FORMAT_ATTR(cfg, lo, hi) 198 - 199 - #define GEN_PMU_FORMAT_ATTR(name) \ 200 - PMU_FORMAT_ATTR(name, \ 201 - _GEN_PMU_FORMAT_ATTR(ATTR_CFG_FLD_##name##_CFG, \ 202 - ATTR_CFG_FLD_##name##_LO, \ 203 - ATTR_CFG_FLD_##name##_HI)) 204 - 205 - #define _ATTR_CFG_GET_FLD(attr, cfg, lo, hi) \ 206 - ((((attr)->cfg) >> lo) & GENMASK_ULL(hi - lo, 0)) 207 - 208 - #define ATTR_CFG_GET_FLD(attr, name) \ 209 - _ATTR_CFG_GET_FLD(attr, \ 210 - ATTR_CFG_FLD_##name##_CFG, \ 211 - ATTR_CFG_FLD_##name##_LO, \ 212 - ATTR_CFG_FLD_##name##_HI) 213 191 214 192 GEN_PMU_FORMAT_ATTR(mask); 215 193 GEN_PMU_FORMAT_ATTR(match);