RE: [PATCH] serial: imx: Fix clock imbalance

[Christoph Niedermaier <cniedermaier@dh-electronics.com>]

From: linux-arm-kernel [mailto:linux-arm-kernel-bounces@lists.infradead.org] On Behalf Of Marek Vasut
Sent: Tuesday, December 5, 2023 1:51 AM
> Disable and unprepare the clock on every exit from probe function
> after the clock were prepared and enabled to avoid enable/disable
> imbalance.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
> Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jiri Slaby <jirislaby@kernel.org>
> Cc: NXP Linux Team <linux-imx@nxp.com>
> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Sergey Organov <sorganov@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Tom Rix <trix@redhat.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-serial@vger.kernel.org
> ---
>  drivers/tty/serial/imx.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
> index 52dd8a6b87603..1cce66e5d05d8 100644
> --- a/drivers/tty/serial/imx.c
> +++ b/drivers/tty/serial/imx.c
> @@ -2332,10 +2332,8 @@ static int imx_uart_probe(struct platform_device *pdev)
>         }
> 
>         ret = uart_get_rs485_mode(&sport->port);
> -       if (ret) {
> -               clk_disable_unprepare(sport->clk_ipg);
> -               return ret;
> -       }
> +       if (ret)
> +               goto err_clk;
> 
>         if (sport->port.rs485.flags & SER_RS485_ENABLED &&
>             (!sport->have_rtscts && !sport->have_rtsgpio))
> @@ -2436,7 +2434,7 @@ static int imx_uart_probe(struct platform_device *pdev)
>                 if (ret) {
>                         dev_err(&pdev->dev, "failed to request rx irq: %d\n",
>                                 ret);
> -                       return ret;
> +                       goto err_clk;
>                 }
> 
>                 ret = devm_request_irq(&pdev->dev, txirq, imx_uart_txint, 0,
> @@ -2444,7 +2442,7 @@ static int imx_uart_probe(struct platform_device *pdev)
>                 if (ret) {
>                         dev_err(&pdev->dev, "failed to request tx irq: %d\n",
>                                 ret);
> -                       return ret;
> +                       goto err_clk;
>                 }
> 
>                 ret = devm_request_irq(&pdev->dev, rtsirq, imx_uart_rtsint, 0,
> @@ -2452,14 +2450,14 @@ static int imx_uart_probe(struct platform_device *pdev)
>                 if (ret) {
>                         dev_err(&pdev->dev, "failed to request rts irq: %d\n",
>                                 ret);
> -                       return ret;
> +                       goto err_clk;
>                 }
>         } else {
>                 ret = devm_request_irq(&pdev->dev, rxirq, imx_uart_int, 0,
>                                        dev_name(&pdev->dev), sport);
>                 if (ret) {
>                         dev_err(&pdev->dev, "failed to request irq: %d\n", ret);
> -                       return ret;
> +                       goto err_clk;
>                 }
>         }
> 
> @@ -2468,6 +2466,10 @@ static int imx_uart_probe(struct platform_device *pdev)
>         platform_set_drvdata(pdev, sport);
> 
>         return uart_add_one_port(&imx_uart_uart_driver, &sport->port);
> +
> +err_clk:
> +       clk_disable_unprepare(sport->clk_ipg);
> +       return ret;
>  }
> 
>  static void imx_uart_remove(struct platform_device *pdev)

Reviewed-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>

Regards
Christoph