merged.
Thanks for the fix!
Bruce
In message: [linux-yocto][linux-yocto
v5.15/standard/intel-sdk-5.15/intel-socfpga &
v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga][PATCH 1/1] firmware:
stratix10-svc: remove invalid label err_free_kfifo added by merge conflict
on 22/03/2023 Liwei Song wrote:
> Merge commit: 3be3c294da42 ("Merge branch 'v5.15/standard/base' into
> v5.15/standard/intel-sdk-5.15/intel-socfpga") added an invalid label
> err_free_kfifo which already dropped in commit 4e779fd561b5
> ("HSD #14015013554: firmware: stratix10-svc: Support up to 4 SVC clients")
> this will cause below build error, remove it to fix this.
>
> drivers/firmware/stratix10-svc.c: In function ‘stratix10_svc_drv_probe’:
> drivers/firmware/stratix10-svc.c:1737:24: error: ‘struct
> stratix10_svc_controller’ has no member named ‘svc_fifo’
> kfifo_free(&controller->svc_fifo);
>
> Signed-off-by: Liwei Song <liwei.s...@windriver.com>
> ---
> drivers/firmware/stratix10-svc.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/firmware/stratix10-svc.c
> b/drivers/firmware/stratix10-svc.c
> index 614403cb7033..f41c85a119ac 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -1733,8 +1733,6 @@ static int stratix10_svc_drv_probe(struct
> platform_device *pdev)
>
> err_put_device:
> platform_device_put(svc->stratix10_svc_rsu);
> -err_free_kfifo:
> - kfifo_free(&controller->svc_fifo);
> err_destroy_pool:
> gen_pool_destroy(genpool);
> return ret;
> --
> 2.40.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12303):
https://lists.yoctoproject.org/g/linux-yocto/message/12303
Mute This Topic: https://lists.yoctoproject.org/mt/97772341/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
