On Sat, Dec 31, 2022 at 04:02:17PM +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/realtek_otto_wdt.c | 17 ++---------------
> 1 file changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/watchdog/realtek_otto_wdt.c b/drivers/watchdog/realtek_otto_wdt.c
> index 2a5298c5e8e4..2c30ddd574c5 100644
> --- a/drivers/watchdog/realtek_otto_wdt.c
> +++ b/drivers/watchdog/realtek_otto_wdt.c
> @@ -235,27 +235,14 @@ static const struct watchdog_info otto_wdt_info = {
> WDIOF_PRETIMEOUT,
> };
>
> -static void otto_wdt_clock_action(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> static int otto_wdt_probe_clk(struct otto_wdt_ctrl *ctrl)
> {
> - struct clk *clk = devm_clk_get(ctrl->dev, NULL);
> - int ret;
> + struct clk *clk;
>
> + clk = devm_clk_get_enabled(ctrl->dev, NULL);
> if (IS_ERR(clk))
> return dev_err_probe(ctrl->dev, PTR_ERR(clk), "Failed to get clock\n");
>
> - ret = clk_prepare_enable(clk);
> - if (ret)
> - return dev_err_probe(ctrl->dev, ret, "Failed to enable clock\n");
> -
> - ret = devm_add_action_or_reset(ctrl->dev, otto_wdt_clock_action, clk);
> - if (ret)
> - return ret;
> -
> ctrl->clk_rate_khz = clk_get_rate(clk) / 1000;
> if (ctrl->clk_rate_khz == 0)
> return dev_err_probe(ctrl->dev, -ENXIO, "Failed to get clock rate\n");
> --
> 2.34.1
>
