Commit 8fd15ace authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wim Van Sebroeck
Browse files

watchdog: ixp4xx: 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/5d04e453a4da5cfafb56695a17157fa3ea296511.1672484831.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 e0e0ee02

drivers/watchdog/ixp4xx_wdt.c

+3 −15
Original line number Diff line number Diff line
@@ -112,12 +112,6 @@ static const struct watchdog_info ixp4xx_wdt_info = { 
	.identity = KBUILD_MODNAME,

};



/* Devres-handled clock disablement */

static void ixp4xx_clock_action(void *d)

{

	clk_disable_unprepare(d);

}



static int ixp4xx_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -139,16 +133,10 @@ static int ixp4xx_wdt_probe(struct platform_device *pdev) 
	 * Retrieve rate from a fixed clock from the device tree if

	 * the parent has that, else use the default clock rate.

	 */

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

	if (!IS_ERR(clk)) {

		ret = clk_prepare_enable(clk);

		if (ret)

			return ret;

		ret = devm_add_action_or_reset(dev, ixp4xx_clock_action, clk);

		if (ret)

			return ret;

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

	if (!IS_ERR(clk))

		iwdt->rate = clk_get_rate(clk);

	}



	if (!iwdt->rate)

		iwdt->rate = IXP4XX_TIMER_FREQ;