arm64: Get rid of oprofile leftovers
authorMarc Zyngier <maz@kernel.org>
Wed, 14 Apr 2021 13:44:06 +0000 (14:44 +0100)
committerMarc Zyngier <maz@kernel.org>
Thu, 22 Apr 2021 12:32:39 +0000 (13:32 +0100)
perf_pmu_name() and perf_num_counters() are now unused. Drop them.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210414134409.1266357-3-maz@kernel.org
drivers/perf/arm_pmu.c

index 2d10d84..d4f7f1f 100644 (file)
@@ -581,33 +581,6 @@ static const struct attribute_group armpmu_common_attr_group = {
        .attrs = armpmu_common_attrs,
 };
 
-/* Set at runtime when we know what CPU type we are. */
-static struct arm_pmu *__oprofile_cpu_pmu;
-
-/*
- * Despite the names, these two functions are CPU-specific and are used
- * by the OProfile/perf code.
- */
-const char *perf_pmu_name(void)
-{
-       if (!__oprofile_cpu_pmu)
-               return NULL;
-
-       return __oprofile_cpu_pmu->name;
-}
-EXPORT_SYMBOL_GPL(perf_pmu_name);
-
-int perf_num_counters(void)
-{
-       int max_events = 0;
-
-       if (__oprofile_cpu_pmu != NULL)
-               max_events = __oprofile_cpu_pmu->num_events;
-
-       return max_events;
-}
-EXPORT_SYMBOL_GPL(perf_num_counters);
-
 static int armpmu_count_irq_users(const int irq)
 {
        int cpu, count = 0;
@@ -979,9 +952,6 @@ int armpmu_register(struct arm_pmu *pmu)
        if (ret)
                goto out_destroy;
 
-       if (!__oprofile_cpu_pmu)
-               __oprofile_cpu_pmu = pmu;
-
        pr_info("enabled with %s PMU driver, %d counters available%s\n",
                pmu->name, pmu->num_events,
                has_nmi ? ", using NMIs" : "");