Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/615c6c3c46c3ee8e3136725af0ab0b51e1298091.1672474336.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

authored by

Christophe JAILLET and committed by
Wim Van Sebroeck
616a2fe3 c4b8e92b

+1 -16
+1 -16
drivers/watchdog/cadence_wdt.c
··· 274 274 .set_timeout = cdns_wdt_settimeout, 275 275 }; 276 276 277 - static void cdns_clk_disable_unprepare(void *data) 278 - { 279 - clk_disable_unprepare(data); 280 - } 281 - 282 277 /************************Platform Operations*****************************/ 283 278 /** 284 279 * cdns_wdt_probe - Probe call for the device. ··· 328 333 watchdog_stop_on_reboot(cdns_wdt_device); 329 334 watchdog_set_drvdata(cdns_wdt_device, wdt); 330 335 331 - wdt->clk = devm_clk_get(dev, NULL); 336 + wdt->clk = devm_clk_get_enabled(dev, NULL); 332 337 if (IS_ERR(wdt->clk)) 333 338 return dev_err_probe(dev, PTR_ERR(wdt->clk), 334 339 "input clock not found\n"); 335 - 336 - ret = clk_prepare_enable(wdt->clk); 337 - if (ret) { 338 - dev_err(dev, "unable to enable clock\n"); 339 - return ret; 340 - } 341 - ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare, 342 - wdt->clk); 343 - if (ret) 344 - return ret; 345 340 346 341 clock_f = clk_get_rate(wdt->clk); 347 342 if (clock_f <= CDNS_WDT_CLK_75MHZ) {