On Wed, Apr 10, 2024 at 04:40:38PM +0300, Claudiu wrote:
> From: Claudiu Beznea <[email protected]>
>
> pm_runtime_put() may return an error code. Check its return status.
>
> Along with it the rzg2l_wdt_set_timeout() function was updated to
> propagate the result of rzg2l_wdt_stop() to its caller.
>
> Fixes: 2cbc5cd0b55f ("watchdog: Add Watchdog Timer driver for RZ/G2L")
> Signed-off-by: Claudiu Beznea <[email protected]>
> ---
>
> Changes in v8:
> - none
>
> Changes in v7:
> - none
>
> Changes in v6:
> - none
>
> Changes in v5:
> - none
>
> Changes in v4:
> - none
>
> Changes in v3:
> - none
>
> Changes in v2:
> - propagate the return code of rzg2l_wdt_stop() to it's callers
>
>
> drivers/watchdog/rzg2l_wdt.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c
> index d87d4f50180c..7bce093316c4 100644
> --- a/drivers/watchdog/rzg2l_wdt.c
> +++ b/drivers/watchdog/rzg2l_wdt.c
> @@ -144,9 +144,13 @@ static int rzg2l_wdt_start(struct watchdog_device *wdev)
> static int rzg2l_wdt_stop(struct watchdog_device *wdev)
> {
> struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev);
> + int ret;
>
> rzg2l_wdt_reset(priv);
> - pm_runtime_put(wdev->parent);
> +
> + ret = pm_runtime_put(wdev->parent);
> + if (ret < 0)
> + return ret;
Nit:
return pm_runtime_put(wdev->parent);
would have been sufficient.
Nevertheless,
Reviewed-by: Guenter Roeck <[email protected]>
>
> return 0;
> }
> @@ -163,7 +167,10 @@ static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int time
> * to reset the module) so that it is updated with new timeout values.
> */
> if (watchdog_active(wdev)) {
> - rzg2l_wdt_stop(wdev);
> + ret = rzg2l_wdt_stop(wdev);
> + if (ret)
> + return ret;
> +
> ret = rzg2l_wdt_start(wdev);
> }
>
> --
> 2.39.2
>
On 10.04.2024 19:41, Guenter Roeck wrote:
> On Wed, Apr 10, 2024 at 04:40:38PM +0300, Claudiu wrote:
>> From: Claudiu Beznea <[email protected]>
>>
>> pm_runtime_put() may return an error code. Check its return status.
>>
>> Along with it the rzg2l_wdt_set_timeout() function was updated to
>> propagate the result of rzg2l_wdt_stop() to its caller.
>>
>> Fixes: 2cbc5cd0b55f ("watchdog: Add Watchdog Timer driver for RZ/G2L")
>> Signed-off-by: Claudiu Beznea <[email protected]>
>> ---
>>
>> Changes in v8:
>> - none
>>
>> Changes in v7:
>> - none
>>
>> Changes in v6:
>> - none
>>
>> Changes in v5:
>> - none
>>
>> Changes in v4:
>> - none
>>
>> Changes in v3:
>> - none
>>
>> Changes in v2:
>> - propagate the return code of rzg2l_wdt_stop() to it's callers
>>
>>
>> drivers/watchdog/rzg2l_wdt.c | 11 +++++++++--
>> 1 file changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c
>> index d87d4f50180c..7bce093316c4 100644
>> --- a/drivers/watchdog/rzg2l_wdt.c
>> +++ b/drivers/watchdog/rzg2l_wdt.c
>> @@ -144,9 +144,13 @@ static int rzg2l_wdt_start(struct watchdog_device *wdev)
>> static int rzg2l_wdt_stop(struct watchdog_device *wdev)
>> {
>> struct rzg2l_wdt_priv *priv = watchdog_get_drvdata(wdev);
>> + int ret;
>>
>> rzg2l_wdt_reset(priv);
>> - pm_runtime_put(wdev->parent);
>> +
>> + ret = pm_runtime_put(wdev->parent);
>> + if (ret < 0)
>> + return ret;
>
> Nit:
> return pm_runtime_put(wdev->parent);
>
> would have been sufficient.
>
pm_runtime_put() may return 1 if the device is already suspended. Further
explained in v1 of this series:
https://lore.kernel.org/all/[email protected]/
> Nevertheless,
>
> Reviewed-by: Guenter Roeck <[email protected]>
>
>>
>> return 0;
>> }
>> @@ -163,7 +167,10 @@ static int rzg2l_wdt_set_timeout(struct watchdog_device *wdev, unsigned int time
>> * to reset the module) so that it is updated with new timeout values.
>> */
>> if (watchdog_active(wdev)) {
>> - rzg2l_wdt_stop(wdev);
>> + ret = rzg2l_wdt_stop(wdev);
>> + if (ret)
>> + return ret;
>> +
>> ret = rzg2l_wdt_start(wdev);
>> }
>>
>> --
>> 2.39.2
>>