On Fri, Dec 30, 2022 at 05:32:42PM +0100, Christophe JAILLET wrote:
> 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 and avoids the need of a dedicated function used
> with devm_add_action_or_reset().
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/visconti_wdt.c | 17 +----------------
> 1 file changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/drivers/watchdog/visconti_wdt.c b/drivers/watchdog/visconti_wdt.c
> index 83ef55e66ca8..cef0794708e7 100644
> --- a/drivers/watchdog/visconti_wdt.c
> +++ b/drivers/watchdog/visconti_wdt.c
> @@ -112,11 +112,6 @@ static const struct watchdog_ops visconti_wdt_ops = {
> .set_timeout = visconti_wdt_set_timeout,
> };
>
> -static void visconti_clk_disable_unprepare(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> static int visconti_wdt_probe(struct platform_device *pdev)
> {
> struct watchdog_device *wdev;
> @@ -134,20 +129,10 @@ static int visconti_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(priv->base))
> return PTR_ERR(priv->base);
>
> - clk = devm_clk_get(dev, NULL);
> + clk = devm_clk_get_enabled(dev, NULL);
> if (IS_ERR(clk))
> return dev_err_probe(dev, PTR_ERR(clk), "Could not get clock\n");
>
> - ret = clk_prepare_enable(clk);
> - if (ret) {
> - dev_err(dev, "Could not enable clock\n");
> - return ret;
> - }
> -
> - ret = devm_add_action_or_reset(dev, visconti_clk_disable_unprepare, clk);
> - if (ret)
> - return ret;
> -
> clk_freq = clk_get_rate(clk);
> if (!clk_freq)
> return -EINVAL;
> --
> 2.34.1
>
