[RFCv4 4/7] drivers/perf: arm_pmu: only use common attr_groups

From: Mark Rutland
Date: Thu Sep 08 2016 - 06:23:10 EST


Now that the 32-bit and 64-bit perf backends use the common groups
directly, remove the fallback and no longer allow the groups array to be
overridden.

Signed-off-by: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
---
drivers/perf/arm_pmu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 145caf4..ac83e1e 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -549,6 +549,7 @@ static void armpmu_init(struct arm_pmu *armpmu)
.stop = armpmu_stop,
.read = armpmu_read,
.filter_match = armpmu_filter_match,
+ .attr_groups = armpmu->attr_groups,
};
}

@@ -1039,8 +1040,6 @@ int arm_pmu_device_probe(struct platform_device *pdev,
goto out_free;
}

- if (!pmu->pmu.attr_groups)
- pmu->pmu.attr_groups = pmu->attr_groups;

ret = cpu_pmu_init(pmu);
if (ret)
--
1.9.1