Merge tag 'nfs-for-5.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / drivers / perf / qcom_l3_pmu.c

diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c
index bba0780..1ff2ff6 100644 (file)
--- a/drivers/perf/qcom_l3_pmu.c
+++ b/drivers/perf/qcom_l3_pmu.c
@@ -647,10 +647,7 @@ static ssize_t l3cache_pmu_event_show(struct device *dev,
 }
 
 #define L3CACHE_EVENT_ATTR(_name, _id)                                      \
-       (&((struct perf_pmu_events_attr[]) {                                 \
-               { .attr = __ATTR(_name, 0444, l3cache_pmu_event_show, NULL), \
-                 .id = _id, }                                               \
-       })[0].attr.attr)
+       PMU_EVENT_ATTR_ID(_name, l3cache_pmu_event_show, _id)
 
 static struct attribute *qcom_l3_cache_pmu_events[] = {
        L3CACHE_EVENT_ATTR(cycles, L3_EVENT_CYCLES),
@@ -670,15 +667,15 @@ static const struct attribute_group qcom_l3_cache_pmu_events_group = {
 
 /* cpumask */
 
-static ssize_t qcom_l3_cache_pmu_cpumask_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
+static ssize_t cpumask_show(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
        struct l3cache_pmu *l3pmu = to_l3cache_pmu(dev_get_drvdata(dev));
 
        return cpumap_print_to_pagebuf(true, buf, &l3pmu->cpumask);
 }
 
-static DEVICE_ATTR(cpumask, 0444, qcom_l3_cache_pmu_cpumask_show, NULL);
+static DEVICE_ATTR_RO(cpumask);
 
 static struct attribute *qcom_l3_cache_pmu_cpumask_attrs[] = {
        &dev_attr_cpumask.attr,
@@ -767,10 +764,8 @@ static int qcom_l3_cache_pmu_probe(struct platform_device *pdev)
 
        memrc = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        l3pmu->regs = devm_ioremap_resource(&pdev->dev, memrc);
-       if (IS_ERR(l3pmu->regs)) {
-               dev_err(&pdev->dev, "Can't map PMU @%pa\n", &memrc->start);
+       if (IS_ERR(l3pmu->regs))
                return PTR_ERR(l3pmu->regs);
-       }
 
        qcom_l3_cache__init(l3pmu);