perf/smmuv3: Remove the leftover put_cpu() in error path
PATCH v2 1/1 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.
--- drivers/perf/arm_smmuv3_pmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/perf/arm_smmuv3_pmu.c +1 -3
@@ -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; }
Signature · 7 lines
1.7.12.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[+Catalin]
Quoted 27 lines · Hanjun Guo
In
smmu_pmu_probe(), there isput_cpu()in the error path, which is wrong because we useraw_smp_processor_id()to get the cpu ID, notget_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 <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/perf/arm_smmuv3_pmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/perf/arm_smmuv3_pmu.c +1
-1@@ -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 );
drivers/perf/arm_smmuv3_pmu.c static int smmu_pmu_probe(struct platform_device *pdev) · line 837
Quoted 7 lines
drivers/perf/arm_smmuv3_pmu.c +0
-2@@ -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; }
Catalin -- please can you take this as a fix via the arm64 tree? I don't have any other perf patches pending at the moment.
Cheers,
Will
Quoted 38 lines · Will Deacon
Quoted 27 lines · Hanjun Guo
In
smmu_pmu_probe(), there isput_cpu()in the error path, which is wrong because we useraw_smp_processor_id()to get the cpu ID, notget_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 <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/perf/arm_smmuv3_pmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/perf/arm_smmuv3_pmu.c +1
-1@@ -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 );drivers/perf/arm_smmuv3_pmu.c static int smmu_pmu_probe(struct platform_device *pdev) · line 837
Quoted 7 lines
drivers/perf/arm_smmuv3_pmu.c +0
-2@@ -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; }Acked-by Will Deacon <[email protected]>
Quoted 2 lines
Catalin -- please can you take this as a fix via the arm64 tree? I don't have any other perf patches pending at the moment.
Queued.
Signature · 1 line
Catalin