Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Qi Liu <liuqi115@huawei.com>
To:     <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>
CC:     <linuxarm@huawei.com>, Will Deacon <will@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v2 8/9] drivers/perf: Remove redundant macro and functions in arm_dsu_pmu.c
Date:   Wed, 19 May 2021 17:51:58 +0800
Message-ID: <1621417919-6632-9-git-send-email-liuqi115@huawei.com>
In-Reply-To: <1621417919-6632-1-git-send-email-liuqi115@huawei.com>
References: <1621417919-6632-1-git-send-email-liuqi115@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Remove DSU_EVENT_ATTR and dsu_pmu_sysfs_event_show(), as there is
a general function for this.

Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Qi Liu <liuqi115@huawei.com>
---
 drivers/perf/arm_dsu_pmu.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 196faea..33bb97e 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -81,9 +81,6 @@
 		}							\
 	})[0].attr.attr)
 
-#define DSU_EVENT_ATTR(_name, _config)		\
-	DSU_EXT_ATTR(_name, dsu_pmu_sysfs_event_show, (unsigned long)_config)
-
 #define DSU_FORMAT_ATTR(_name, _config)		\
 	DSU_EXT_ATTR(_name, dsu_pmu_sysfs_format_show, (char *)_config)
 
@@ -130,15 +127,6 @@ static inline struct dsu_pmu *to_dsu_pmu(struct pmu *pmu)
 	return container_of(pmu, struct dsu_pmu, pmu);
 }
 
-static ssize_t dsu_pmu_sysfs_event_show(struct device *dev,
-					struct device_attribute *attr,
-					char *buf)
-{
-	struct dev_ext_attribute *eattr = container_of(attr,
-					struct dev_ext_attribute, attr);
-	return sysfs_emit(buf, "event=0x%lx\n", (unsigned long)eattr->var);
-}
-
 static ssize_t dsu_pmu_sysfs_format_show(struct device *dev,
 					 struct device_attribute *attr,
 					 char *buf)
@@ -183,14 +171,14 @@ static const struct attribute_group dsu_pmu_format_attr_group = {
 };
 
 static struct attribute *dsu_pmu_event_attrs[] = {
-	DSU_EVENT_ATTR(cycles, 0x11),
-	DSU_EVENT_ATTR(bus_access, 0x19),
-	DSU_EVENT_ATTR(memory_error, 0x1a),
-	DSU_EVENT_ATTR(bus_cycles, 0x1d),
-	DSU_EVENT_ATTR(l3d_cache_allocate, 0x29),
-	DSU_EVENT_ATTR(l3d_cache_refill, 0x2a),
-	DSU_EVENT_ATTR(l3d_cache, 0x2b),
-	DSU_EVENT_ATTR(l3d_cache_wb, 0x2c),
+	PMU_EVENT_ATTR_ID(cycles, 0x11),
+	PMU_EVENT_ATTR_ID(bus_access, 0x19),
+	PMU_EVENT_ATTR_ID(memory_error, 0x1a),
+	PMU_EVENT_ATTR_ID(bus_cycles, 0x1d),
+	PMU_EVENT_ATTR_ID(l3d_cache_allocate, 0x29),
+	PMU_EVENT_ATTR_ID(l3d_cache_refill, 0x2a),
+	PMU_EVENT_ATTR_ID(l3d_cache, 0x2b),
+	PMU_EVENT_ATTR_ID(l3d_cache_wb, 0x2c),
 	NULL,
 };
 
-- 
2.7.4