Commit 8ae4bcf4 authored by Hanjun Guo's avatar Hanjun Guo Committed by Catalin Marinas

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: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent e42617b8
...@@ -814,7 +814,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) ...@@ -814,7 +814,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);
...@@ -833,8 +833,6 @@ static int smmu_pmu_probe(struct platform_device *pdev) ...@@ -833,8 +833,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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment