Commit 1589680d authored Sep 09, 2016 by Mark Rutland Committed by Will Deacon Sep 09, 2016

drivers/perf: arm_pmu: only use common attr_groups



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@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 9268c5da

drivers/perf/arm_pmu.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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,
		};
		}

		@@ -1037,8 +1038,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)