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: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Sander Vanheule <sander@svanheule.net> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/5e4255782fbb43d1b4b5cd03bd12d7a184497134.1672498920.git.christophe.jaillet@wanadoo.fr Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Родитель
a224764f97
Коммит
3c22939eb3
|
@ -235,27 +235,14 @@ static const struct watchdog_info otto_wdt_info = {
|
||||||
WDIOF_PRETIMEOUT,
|
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)
|
static int otto_wdt_probe_clk(struct otto_wdt_ctrl *ctrl)
|
||||||
{
|
{
|
||||||
struct clk *clk = devm_clk_get(ctrl->dev, NULL);
|
struct clk *clk;
|
||||||
int ret;
|
|
||||||
|
|
||||||
|
clk = devm_clk_get_enabled(ctrl->dev, NULL);
|
||||||
if (IS_ERR(clk))
|
if (IS_ERR(clk))
|
||||||
return dev_err_probe(ctrl->dev, PTR_ERR(clk), "Failed to get clock\n");
|
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;
|
ctrl->clk_rate_khz = clk_get_rate(clk) / 1000;
|
||||||
if (ctrl->clk_rate_khz == 0)
|
if (ctrl->clk_rate_khz == 0)
|
||||||
return dev_err_probe(ctrl->dev, -ENXIO, "Failed to get clock rate\n");
|
return dev_err_probe(ctrl->dev, -ENXIO, "Failed to get clock rate\n");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче