Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

[J-linux.git] / drivers / tty / serial / sccnxp.c

diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index 7df6878226340d263528e06eea0b925f79abaf4e..4f2fc5f7bb1932feaf725d482e4f04168032e6de 100644 (file)
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -913,23 +913,13 @@ static int sccnxp_probe(struct platform_device *pdev)
        } else if (PTR_ERR(s->regulator) == -EPROBE_DEFER)
                return -EPROBE_DEFER;
 
-       clk = devm_clk_get(&pdev->dev, NULL);
+       clk = devm_clk_get_enabled(&pdev->dev, NULL);
        if (IS_ERR(clk)) {
                ret = PTR_ERR(clk);
                if (ret == -EPROBE_DEFER)
                        goto err_out;
                uartclk = 0;
        } else {
-               ret = clk_prepare_enable(clk);
-               if (ret)
-                       goto err_out;
-
-               ret = devm_add_action_or_reset(&pdev->dev,
-                               (void(*)(void *))clk_disable_unprepare,
-                               clk);
-               if (ret)
-                       goto err_out;
-
                uartclk = clk_get_rate(clk);
        }