mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
perf/smmuv3: Remove the leftover put_cpu() in error path
[ Upstream commit 8ae4bcf482
]
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:
parent
2d300cb3bd
commit
88184162e9
1 changed files with 1 additions and 3 deletions
|
@ -815,7 +815,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);
|
||||
|
@ -834,8 +834,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue