Messages in this thread Patch in this message | | | From | Rasmus Villemoes <> | Subject | [PATCH v2 1/2] watchdog: introduce watchdog_worker_should_ping helper | Date | Mon, 12 Dec 2016 10:17:52 +0100 |
| |
This will be useful when the condition becomes slightly more complicated in the next patch.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- drivers/watchdog/watchdog_dev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 32930a0..ca0a000 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -192,6 +192,11 @@ static int watchdog_ping(struct watchdog_device *wdd) return __watchdog_ping(wdd); } +static bool watchdog_worker_should_ping(struct watchdog_device *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; @@ -202,7 +207,7 @@ static void watchdog_ping_work(struct work_struct *work) mutex_lock(&wd_data->lock); wdd = wd_data->wdd; - if (wdd && (watchdog_active(wdd) || watchdog_hw_running(wdd))) + if (watchdog_worker_should_ping(wdd)) __watchdog_ping(wdd); mutex_unlock(&wd_data->lock); } -- 2.7.4
| |