diff options
| author | Hanjun Guo <guohanjun@huawei.com> | 2019-12-11 14:43:06 +0800 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2019-12-18 16:15:36 +0000 |
| commit | 8ae4bcf4821c18a8fbfa0b2c1df26c1085e9d923 (patch) | |
| tree | 6bd186859185689f2c550cea67ef50a7376be5c0 /drivers/perf | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
| download | linux-8ae4bcf4821c18a8fbfa0b2c1df26c1085e9d923.tar.bz2 | |
perf/smmuv3: Remove the leftover put_cpu() in error path
In smmu_pmu_probe(), there is put_cpu() in the error path,
which is wrong because we use raw_smp_processor_id() to
get the cpu ID, not get_cpu(), remove it.
While we are at it, kill 'out_cpuhp_err' altogether and
just return err if we fail to add the hotplug instance.
Acked-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'drivers/perf')
| -rw-r--r-- | drivers/perf/arm_smmuv3_pmu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 773128f411f1..d704eccc548f 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c @@ -814,7 +814,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) if (err) { dev_err(dev, "Error %d registering hotplug, PMU @%pa\n", err, &res_0->start); - goto out_cpuhp_err; + return err; } err = perf_pmu_register(&smmu_pmu->pmu, name, -1); @@ -833,8 +833,6 @@ static int smmu_pmu_probe(struct platform_device *pdev) out_unregister: cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node); -out_cpuhp_err: - put_cpu(); return err; } |