lkml.org 
[lkml]   [2017]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v5 1/3] watchdog: introduce watchdog_worker_should_ping helper
From
Date
On 05/22/2017 07:06 AM, Rasmus Villemoes wrote:
> This will be useful when the condition becomes slightly more
> complicated in the next patch.
>
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/watchdog/watchdog_dev.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index d5d2bbd..caa4b90 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -192,18 +192,23 @@ static int watchdog_ping(struct watchdog_device *wdd)
> return __watchdog_ping(wdd);
> }
>
> +static bool watchdog_worker_should_ping(struct watchdog_core_data *wd_data)
> +{
> + struct watchdog_device *wdd = wd_data->wdd;
> +
> + return wdd && (watchdog_active(wdd) || watchdog_hw_running(wdd));
> +}
> +
> static void watchdog_ping_work(struct work_struct *work)
> {
> struct watchdog_core_data *wd_data;
> - struct watchdog_device *wdd;
>
> wd_data = container_of(to_delayed_work(work), struct watchdog_core_data,
> work);
>
> mutex_lock(&wd_data->lock);
> - wdd = wd_data->wdd;
> - if (wdd && (watchdog_active(wdd) || watchdog_hw_running(wdd)))
> - __watchdog_ping(wdd);
> + if (watchdog_worker_should_ping(wd_data))
> + __watchdog_ping(wd_data->wdd);
> mutex_unlock(&wd_data->lock);
> }
>
>

\
 
 \ /
  Last update: 2017-05-25 02:53    [W:0.143 / U:0.816 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site