Commit 616a2fe3 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wim Van Sebroeck
Browse files

watchdog: cadence: 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/615c6c3c46c3ee8e3136725af0ab0b51e1298091.1672474336.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 c4b8e92b

drivers/watchdog/cadence_wdt.c

+1 −16
Original line number Diff line number Diff line
@@ -274,11 +274,6 @@ static const struct watchdog_ops cdns_wdt_ops = { 
	.set_timeout = cdns_wdt_settimeout,

};



static void cdns_clk_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



/************************Platform Operations*****************************/

/**

 * cdns_wdt_probe - Probe call for the device.
@@ -333,21 +328,11 @@ static int cdns_wdt_probe(struct platform_device *pdev) 
	watchdog_stop_on_reboot(cdns_wdt_device);

	watchdog_set_drvdata(cdns_wdt_device, wdt);



	wdt->clk = devm_clk_get(dev, NULL);

	wdt->clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(wdt->clk))

		return dev_err_probe(dev, PTR_ERR(wdt->clk),

				     "input clock not found\n");



	ret = clk_prepare_enable(wdt->clk);

	if (ret) {

		dev_err(dev, "unable to enable clock\n");

		return ret;

	}

	ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,

				       wdt->clk);

	if (ret)

		return ret;



	clock_f = clk_get_rate(wdt->clk);

	if (clock_f <= CDNS_WDT_CLK_75MHZ) {

		wdt->prescaler = CDNS_WDT_PRESCALE_512;