Skip to content

Commit 03e30f0

Browse files
tititiou36gregkh
authored andcommitted
serial: sccnxp: Use devm_clk_get_enabled() helper
The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code. This also avoids some other warnings/issues. (see [1]) [1]: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Christophe JAILLET <[email protected]> Link: https://lore.kernel.org/r/735a807c2df835aa436dcbc76b374f983f89a9af.1672419577.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6e05467 commit 03e30f0

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

drivers/tty/serial/sccnxp.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -913,23 +913,13 @@ static int sccnxp_probe(struct platform_device *pdev)
913913
} else if (PTR_ERR(s->regulator) == -EPROBE_DEFER)
914914
return -EPROBE_DEFER;
915915

916-
clk = devm_clk_get(&pdev->dev, NULL);
916+
clk = devm_clk_get_enabled(&pdev->dev, NULL);
917917
if (IS_ERR(clk)) {
918918
ret = PTR_ERR(clk);
919919
if (ret == -EPROBE_DEFER)
920920
goto err_out;
921921
uartclk = 0;
922922
} else {
923-
ret = clk_prepare_enable(clk);
924-
if (ret)
925-
goto err_out;
926-
927-
ret = devm_add_action_or_reset(&pdev->dev,
928-
(void(*)(void *))clk_disable_unprepare,
929-
clk);
930-
if (ret)
931-
goto err_out;
932-
933923
uartclk = clk_get_rate(clk);
934924
}
935925

0 commit comments

Comments
 (0)