tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

watchdog: rz: Discard pm_runtime_put() return values

Failing a watchdog stop due to pm_runtime_put() returning a negative
value is not particularly useful.

Returning an error code from pm_runtime_put() merely means that it has
not queued up a work item to check whether or not the device can be
suspended and there are many perfectly valid situations in which that
can happen, like after writing "on" to the devices' runtime PM "control"
attribute in sysfs for one example. It also happens when the kernel is
configured with CONFIG_PM unset.

Accordingly, update rzg2l_wdt_stop() and rzv2h_wdt_stop() to simply
discard the return value of pm_runtime_put().

This will facilitate a planned change of the pm_runtime_put() return
type to void in the future.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://patch.msgid.link/3340071.5fSG56mABF@rafael.j.wysocki

Rafael J. Wysocki f52defa7 c9f7b0e6

+2 -6
+1 -3
drivers/watchdog/rzg2l_wdt.c
··· 132 132 if (ret) 133 133 return ret; 134 134 135 - ret = pm_runtime_put(wdev->parent); 136 - if (ret < 0) 137 - return ret; 135 + pm_runtime_put(wdev->parent); 138 136 139 137 return 0; 140 138 }
+1 -3
drivers/watchdog/rzv2h_wdt.c
··· 174 174 if (priv->of_data->wdtdcr) 175 175 rzt2h_wdt_wdtdcr_count_stop(priv); 176 176 177 - ret = pm_runtime_put(wdev->parent); 178 - if (ret < 0) 179 - return ret; 177 + pm_runtime_put(wdev->parent); 180 178 181 179 return 0; 182 180 }