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

watchdog: pnx4008: 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/61f4e39db4c88408ee0149580e9aa925b784bc93.1672496714.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 3c22939e

drivers/watchdog/pnx4008_wdt.c

+1 −14
Original line number Diff line number Diff line
@@ -179,11 +179,6 @@ static struct watchdog_device pnx4008_wdd = { 
	.max_timeout = MAX_HEARTBEAT,

};



static void pnx4008_clk_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



static int pnx4008_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -195,18 +190,10 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) 
	if (IS_ERR(wdt_base))

		return PTR_ERR(wdt_base);



	wdt_clk = devm_clk_get(dev, NULL);

	wdt_clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(wdt_clk))

		return PTR_ERR(wdt_clk);



	ret = clk_prepare_enable(wdt_clk);

	if (ret)

		return ret;

	ret = devm_add_action_or_reset(dev, pnx4008_clk_disable_unprepare,

				       wdt_clk);

	if (ret)

		return ret;



	pnx4008_wdd.bootstatus = (readl(WDTIM_RES(wdt_base)) & WDOG_RESET) ?

			WDIOF_CARDRESET : 0;

	pnx4008_wdd.parent = dev;