lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf/smmuv3: Remove the leftover put_cpu() in error path

Browse Source 
[ Upstream commit 8ae4bcf4821c18a8fbfa0b2c1df26c1085e9d923 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hanjun Guo 2019-12-11 14:43:06 +08:00 committed by Greg Kroah-Hartman
parent 2d300cb3bd
commit 88184162e9
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/perf/arm_smmuv3_pmu.c
View File

@ -815,7 +815,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
if (err) { if (err) {
dev_err(dev, "Error %d registering hotplug, PMU @%pa\n", dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",
err, &res_0->start); err, &res_0->start);
goto out_cpuhp_err; return err;
} }
err = perf_pmu_register(&smmu_pmu->pmu, name, -1); err = perf_pmu_register(&smmu_pmu->pmu, name, -1);
@ -834,8 +834,6 @@ static int smmu_pmu_probe(struct platform_device *pdev)
out_unregister: out_unregister:
cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node); cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node);
out_cpuhp_err:
put_cpu();
return err; return err;
} }