]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
watchdog: rzg2l_wdt: Use pm_runtime_resume_and_get()
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Fri, 31 May 2024 06:57:17 +0000 (09:57 +0300)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Wed, 10 Jul 2024 18:01:32 +0000 (20:01 +0200)
pm_runtime_get_sync() may return with error. In case it returns with error
dev->power.usage_count needs to be decremented. pm_runtime_resume_and_get()
takes care of this. Thus use it.

Along with it the rzg2l_wdt_set_timeout() function was updated to
propagate the result of rzg2l_wdt_start() to its caller.

Fixes: 2cbc5cd0b55f ("watchdog: Add Watchdog Timer driver for RZ/G2L")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240531065723.1085423-4-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/rzg2l_wdt.c

index 1741f98ca67c527a326d3376a667e6403ea4380f..d87d4f50180c5c59ccdd56021fd0da548fc31965 100644 (file)
@@ -123,8 +123,11 @@ static void rzg2l_wdt_init_timeout(struct watchdog_device *wdev)
 static int rzg2l_wdt_start(struct watchdog_device *wdev)
 {
        struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev);
+       int ret;
 
-       pm_runtime_get_sync(wdev->parent);
+       ret = pm_runtime_resume_and_get(wdev->parent);
+       if (ret)
+               return ret;
 
        /* Initialize time out */
        rzg2l_wdt_init_timeout(wdev);
@@ -150,6 +153,8 @@ static int rzg2l_wdt_stop(struct watchdog_device *wdev)
 
 static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int timeout)
 {
+       int ret = 0;
+
        wdev->timeout = timeout;
 
        /*
@@ -159,10 +164,10 @@ static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int time
         */
        if (watchdog_active(wdev)) {
                rzg2l_wdt_stop(wdev);
-               rzg2l_wdt_start(wdev);
+               ret = rzg2l_wdt_start(wdev);
        }
 
-       return 0;
+       return ret;
 }
 
 static int rzg2l_wdt_restart(struct watchdog_device *wdev,