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

watchdog: of_xilinx_wdt: 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>
Acked-by: default avatarMichal Simek <michal.simek@amd.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/2b041dc8230a4ed255051bb2d323da8a51a8d0be.1672491445.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 5eb3fb95

drivers/watchdog/of_xilinx_wdt.c

+1 −15
Original line number Diff line number Diff line
@@ -154,11 +154,6 @@ static u32 xwdt_selftest(struct xwdt_device *xdev) 
		return XWT_TIMER_FAILED;

}



static void xwdt_clk_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



static int xwdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -193,7 +188,7 @@ static int xwdt_probe(struct platform_device *pdev) 


	watchdog_set_nowayout(xilinx_wdt_wdd, enable_once);



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

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

	if (IS_ERR(xdev->clk)) {

		if (PTR_ERR(xdev->clk) != -ENOENT)

			return PTR_ERR(xdev->clk);
@@ -211,15 +206,6 @@ static int xwdt_probe(struct platform_device *pdev) 
				 "The watchdog clock freq cannot be obtained\n");

	} else {

		pfreq = clk_get_rate(xdev->clk);

		rc = clk_prepare_enable(xdev->clk);

		if (rc) {

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

			return rc;

		}

		rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,

					      xdev->clk);

		if (rc)

			return rc;

	}



	/*