In message: [PATCH linux-yocto] ARM: imx: Remove unused pmu_release_id label on 20/12/2023 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > Due to the SDK changes, the stable commit 12ac3b0ab837 ("ARM: imx: Check > return value of devm_kasprintf in imx_mmdc_perf_init") doesn't apply to > the nxp branches. But part of this commit was merged mistakenly. Revert > these changes to fix the following build errors: > arch/arm/mach-imx/mmdc.c: In function ‘imx_mmdc_perf_init’: > arch/arm/mach-imx/mmdc.c:528:1: error: label ‘pmu_release_id’ defined but > not used [-Werror=unused-label] > 528 | pmu_release_id: > | ^~~~~~~~~~~~~~ > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Please help me merge this into the following two branches: > v5.15/standard/nxp-sdk-5.15/nxp-soc > v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc merged. Bruce > > arch/arm/mach-imx/mmdc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c > index 0fa9620b040e..7b683094a8e0 100644 > --- a/arch/arm/mach-imx/mmdc.c > +++ b/arch/arm/mach-imx/mmdc.c > @@ -523,10 +523,9 @@ static int imx_mmdc_perf_init(struct platform_device > *pdev, void __iomem *mmdc_b > > pmu_register_err: > pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret); > + ida_simple_remove(&mmdc_ida, pmu_mmdc->id); > cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node); > hrtimer_cancel(&pmu_mmdc->hrtimer); > -pmu_release_id: > - ida_simple_remove(&mmdc_ida, pmu_mmdc->id); > pmu_free: > kfree(pmu_mmdc); > return ret; > -- > 2.39.2 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13432): https://lists.yoctoproject.org/g/linux-yocto/message/13432 Mute This Topic: https://lists.yoctoproject.org/mt/103276741/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
