Commit 1a8d192b authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wim Van Sebroeck
Browse files

watchdog: qcom: 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>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/7c2d5f3815949faf6d3a0237a7b5f272f00a7ae9.1672418969.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 cd9e5d04

drivers/watchdog/qcom-wdt.c

+1 −15
Original line number Diff line number Diff line
@@ -175,11 +175,6 @@ static const struct watchdog_info qcom_wdt_pt_info = { 
	.identity	= KBUILD_MODNAME,

};



static void qcom_clk_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



static const struct qcom_wdt_match_data match_data_apcs_tmr = {

	.offset = reg_offset_data_apcs_tmr,

	.pretimeout = false,
@@ -226,21 +221,12 @@ static int qcom_wdt_probe(struct platform_device *pdev) 
	if (IS_ERR(wdt->base))

		return PTR_ERR(wdt->base);



	clk = devm_clk_get(dev, NULL);

	clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(clk)) {

		dev_err(dev, "failed to get input clock\n");

		return PTR_ERR(clk);

	}



	ret = clk_prepare_enable(clk);

	if (ret) {

		dev_err(dev, "failed to setup clock\n");

		return ret;

	}

	ret = devm_add_action_or_reset(dev, qcom_clk_disable_unprepare, clk);

	if (ret)

		return ret;



	/*

	 * We use the clock rate to calculate the max timeout, so ensure it's

	 * not zero to avoid a divide-by-zero exception.