Commit 3c22939e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wim Van Sebroeck
Browse files

watchdog: realtek_otto: 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 and avoids the need of a dedicated function used
with devm_add_action_or_reset().

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarSander Vanheule <sander@svanheule.net>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/5e4255782fbb43d1b4b5cd03bd12d7a184497134.1672498920.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent a224764f

drivers/watchdog/realtek_otto_wdt.c

+2 −15
Original line number Diff line number Diff line
@@ -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");