summaryrefslogtreecommitdiffstats
path: root/drivers/perf
diff options
context:
space:
mode:
authorShaokun Zhang <zhangshaokun@hisilicon.com>2017-09-27 14:30:24 +0800
committerWill Deacon <will.deacon@arm.com>2017-10-04 13:42:59 +0100
commitd1809d0e64325def212825852b02c2c63b40f5cd (patch)
tree7e01d8f253972993bc181f054bb31942610450ec /drivers/perf
parentccaac16287f9b46c58777f5538c4ba3a9d4c3aeb (diff)
downloadlinux-d1809d0e64325def212825852b02c2c63b40f5cd.tar.bz2
drivers/perf: arm_pmu_acpi: drop redundant acpi_disabled check
acpi_disabled has been checked in armv8_pmu_driver_init and it shall be ZERO in arm_pmu_acpi_probe, clean up this unnecessary check. Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/perf')
-rw-r--r--drivers/perf/arm_pmu_acpi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c
index 3303dd8d8eb5..705f1a390e31 100644
--- a/drivers/perf/arm_pmu_acpi.c
+++ b/drivers/perf/arm_pmu_acpi.c
@@ -193,9 +193,6 @@ int arm_pmu_acpi_probe(armpmu_init_fn init_fn)
int pmu_idx = 0;
int cpu, ret;
- if (acpi_disabled)
- return 0;
-
/*
* Initialise and register the set of PMUs which we know about right
* now. Ideally we'd do this in arm_pmu_acpi_cpu_starting() so that we