watchdog: pic32-dmt: 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/f9a4dcfc6d31bd9c1417e2d97a40cc2c1dbc6f30.1672496405.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c
index f43062b..bc4ccdd 100644 (file)
--- a/drivers/watchdog/pic32-dmt.c
+++ b/drivers/watchdog/pic32-dmt.c
@@ -164,11 +164,6 @@ static struct watchdog_device pic32_dmt_wdd = {
        .ops            = &pic32_dmt_fops,
 };
 
-static void pic32_clk_disable_unprepare(void *data)
-{
-       clk_disable_unprepare(data);
-}
-
 static int pic32_dmt_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -184,20 +179,12 @@ static int pic32_dmt_probe(struct platform_device *pdev)
        if (IS_ERR(dmt->regs))
                return PTR_ERR(dmt->regs);
 
-       dmt->clk = devm_clk_get(dev, NULL);
+       dmt->clk = devm_clk_get_enabled(dev, NULL);
        if (IS_ERR(dmt->clk)) {
                dev_err(dev, "clk not found\n");
                return PTR_ERR(dmt->clk);
        }
 
-       ret = clk_prepare_enable(dmt->clk);
-       if (ret)
-               return ret;
-       ret = devm_add_action_or_reset(dev, pic32_clk_disable_unprepare,
-                                      dmt->clk);
-       if (ret)
-               return ret;
-
        wdd->timeout = pic32_dmt_get_timeout_secs(dmt);
        if (!wdd->timeout) {
                dev_err(dev, "failed to read watchdog register timeout\n");