Commit 153e1a1b authored by James Clark's avatar James Clark Committed by Junhao He
Browse files

perf/arm_dmc620: Remove duplicate format attribute #defines 

mainline inclusion
from mainline-v6.8-rc1
commit a5f4ca68f348ac059efd6a3d7ad4040aed1c0818
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I9Q7QP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a5f4ca68f348ac059efd6a3d7ad4040aed1c0818



--------------------------------

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: default avatarJames Clark <james.clark@arm.com>
Link: https://lore.kernel.org/r/20231211161331.1277825-8-james.clark@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 8ade5125

drivers/perf/arm_dmc620_pmu.c

+1 −21
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/perf_event.h>

#include <linux/perf/arm_pmu.h>

#include <linux/platform_device.h>

#include <linux/printk.h>

#include <linux/rculist.h>
@@ -189,27 +190,6 @@ static const struct attribute_group dmc620_pmu_events_attr_group = { 
#define ATTR_CFG_FLD_clkdiv2_LO		9

#define ATTR_CFG_FLD_clkdiv2_HI		9



#define __GEN_PMU_FORMAT_ATTR(cfg, lo, hi)			\

	(lo) == (hi) ? #cfg ":" #lo "\n" : #cfg ":" #lo "-" #hi



#define _GEN_PMU_FORMAT_ATTR(cfg, lo, hi)			\

	__GEN_PMU_FORMAT_ATTR(cfg, lo, hi)



#define GEN_PMU_FORMAT_ATTR(name)				\

	PMU_FORMAT_ATTR(name,					\

	_GEN_PMU_FORMAT_ATTR(ATTR_CFG_FLD_##name##_CFG,		\

			     ATTR_CFG_FLD_##name##_LO,		\

			     ATTR_CFG_FLD_##name##_HI))



#define _ATTR_CFG_GET_FLD(attr, cfg, lo, hi)			\

	((((attr)->cfg) >> lo) & GENMASK_ULL(hi - lo, 0))



#define ATTR_CFG_GET_FLD(attr, name)				\

	_ATTR_CFG_GET_FLD(attr,					\

			  ATTR_CFG_FLD_##name##_CFG,		\

			  ATTR_CFG_FLD_##name##_LO,		\

			  ATTR_CFG_FLD_##name##_HI)



GEN_PMU_FORMAT_ATTR(mask);

GEN_PMU_FORMAT_ATTR(match);

GEN_PMU_FORMAT_ATTR(invert);