Since commit 169332680aaa ("Merge branch 'v5.15/standard/base'
into v5.15/standard/nxp-sdk-5.15/nxp-soc") merge conflicts,
so remove duplicate failed_get_rs485, since commit 7ef67d38b294
("fsl_lpuart: Don't enable interrupts too early") has failed_irq_request
moved the location, so delete the redundant goto failed_irq_request.Signed-off-by: Xiaolei Wang <[email protected]> --- drivers/tty/serial/fsl_lpuart.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 68a51e524f0f..3f8fe874905d 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -2938,9 +2938,6 @@ static int lpuart_probe(struct platform_device *pdev) handler = lpuart_int; } - if (ret) - goto failed_irq_request; - pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, UART_AUTOSUSPEND_TIMEOUT); pm_runtime_set_active(&pdev->dev); @@ -2972,14 +2969,12 @@ static int lpuart_probe(struct platform_device *pdev) return 0; -failed_get_rs485: +failed_irq_request: uart_remove_one_port(&lpuart_reg, &sport->port); failed_attach_port: pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); -failed_irq_request: - uart_remove_one_port(&lpuart_reg, &sport->port); failed_get_rs485: failed_reset: lpuart_disable_clks(sport); -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12134): https://lists.yoctoproject.org/g/linux-yocto/message/12134 Mute This Topic: https://lists.yoctoproject.org/mt/96699206/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
