Skip to content

Commit 4a4da48

Browse files
rafaeljwWim Van Sebroeck
authored andcommitted
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> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 439cf01 commit 4a4da48

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

drivers/watchdog/rzg2l_wdt.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ static int rzg2l_wdt_stop(struct watchdog_device *wdev)
132132
if (ret)
133133
return ret;
134134

135-
ret = pm_runtime_put(wdev->parent);
136-
if (ret < 0)
137-
return ret;
135+
pm_runtime_put(wdev->parent);
138136

139137
return 0;
140138
}

drivers/watchdog/rzv2h_wdt.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ static int rzv2h_wdt_stop(struct watchdog_device *wdev)
174174
if (priv->of_data->wdtdcr)
175175
rzt2h_wdt_wdtdcr_count_stop(priv);
176176

177-
ret = pm_runtime_put(wdev->parent);
178-
if (ret < 0)
179-
return ret;
177+
pm_runtime_put(wdev->parent);
180178

181179
return 0;
182180
}

0 commit comments

Comments
 (0)