Re: [linux-yocto] [PATCH v5.15 nxp-soc] fsl_lpuart: remove another duplicate label

2023-02-03 Thread Kevin Hao
On Fri, Feb 03, 2023 at 12:55:36PM -0500, Paul Gortmaker wrote:
> The v5.15 has a linux-stable specific fixup in
> commit 068b51219362 ("serial: fixup backport of "serial: Deassert
> Transmit Enable on probe in driver-specific way")
> 
> Unfortunately that fixup left us with a duplicate label on this
> branch (and -rt branch), causing:
> 
> drivers/tty/serial/fsl_lpuart.c:2983:1: error: duplicate label 
> 'failed_get_rs485'
> |  2983 | failed_get_rs485:
> |   | ^~~~
> |
> drivers/tty/serial/fsl_lpuart.c:2975:1:
> note: previous definition of 'failed_get_rs485' with type 'void'
> |  2975 | failed_get_rs485:
> |   | ^~~~

Hi Paul,

Xiaolei has sent a similar patch [1] to fix this issue. Even he had indicated
that it target to the v5.10 kernel, but I believe that is typo and it should
be for the v5.15 kernel.

[1] https://lists.yoctoproject.org/g/linux-yocto/message/12134

Thanks,
Kevin

> 
> Reading of the linux-stable fixup makes it reasonably clear that the
> 2nd instance of the label is the one that was meant to remain.
> 
> Signed-off-by: Paul Gortmaker 
> 
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index 68a51e524f0f..aa52b3ff9279 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -2972,7 +2972,6 @@ static int lpuart_probe(struct platform_device *pdev)
>  
>   return 0;
>  
> -failed_get_rs485:
>   uart_remove_one_port(_reg, >port);
>  failed_attach_port:
>   pm_runtime_disable(>dev);
> -- 
> 2.33.0
> 

> 
> 
> 



signature.asc
Description: PGP signature

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12139): 
https://lists.yoctoproject.org/g/linux-yocto/message/12139
Mute This Topic: https://lists.yoctoproject.org/mt/96728644/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[linux-yocto] [PATCH v5.15 nxp-soc] fsl_lpuart: remove another duplicate label

2023-02-03 Thread Paul Gortmaker
The v5.15 has a linux-stable specific fixup in
commit 068b51219362 ("serial: fixup backport of "serial: Deassert
Transmit Enable on probe in driver-specific way")

Unfortunately that fixup left us with a duplicate label on this
branch (and -rt branch), causing:

drivers/tty/serial/fsl_lpuart.c:2983:1: error: duplicate label 
'failed_get_rs485'
|  2983 | failed_get_rs485:
|   | ^~~~
|
drivers/tty/serial/fsl_lpuart.c:2975:1:
note: previous definition of 'failed_get_rs485' with type 'void'
|  2975 | failed_get_rs485:
|   | ^~~~

Reading of the linux-stable fixup makes it reasonably clear that the
2nd instance of the label is the one that was meant to remain.

Signed-off-by: Paul Gortmaker 

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 68a51e524f0f..aa52b3ff9279 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -2972,7 +2972,6 @@ static int lpuart_probe(struct platform_device *pdev)
 
return 0;
 
-failed_get_rs485:
uart_remove_one_port(_reg, >port);
 failed_attach_port:
pm_runtime_disable(>dev);
-- 
2.33.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12136): 
https://lists.yoctoproject.org/g/linux-yocto/message/12136
Mute This Topic: https://lists.yoctoproject.org/mt/96728644/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-