mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To: Wim Van Sebroeck <wim@iguana.be>, Guenter Roeck <linux@roeck-us.net>
Cc: Sebastian Reichel <sebastian.reichel@collabora.co.uk>,
	<esben.haabendal@gmail.com>,
	Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
	<linux-watchdog@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v5 1/3] watchdog: introduce watchdog_worker_should_ping helper
Date: Mon, 22 May 2017 16:06:37 +0200	[thread overview]
Message-ID: <1495462000-28979-2-git-send-email-rasmus.villemoes@prevas.dk> (raw)
In-Reply-To: <1495462000-28979-1-git-send-email-rasmus.villemoes@prevas.dk>

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 | 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);
 }
 
-- 
2.7.4

  reply	other threads:[~2017-05-22 14:17 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-22 14:06 [PATCH v5 0/3] watchdog: allow setting deadline for opening /dev/watchdogN Rasmus Villemoes
2017-05-22 14:06 ` Rasmus Villemoes [this message]
2017-05-25  0:53   ` [PATCH v5 1/3] watchdog: introduce watchdog_worker_should_ping helper Guenter Roeck
2017-05-22 14:06 ` [PATCH v5 2/3] watchdog: introduce watchdog.open_timeout commandline parameter Rasmus Villemoes
2017-05-25  0:56   ` Guenter Roeck
2017-05-30  8:00     ` Rasmus Villemoes
2017-05-22 14:06 ` [PATCH v5 3/3] watchdog: introduce CONFIG_WATCHDOG_OPEN_TIMEOUT Rasmus Villemoes
2017-05-22 18:07 ` [PATCH v5 0/3] watchdog: allow setting deadline for opening /dev/watchdogN Alan Cox
2017-05-22 19:44   ` Guenter Roeck
2017-05-23  7:15   ` Rasmus Villemoes
2017-05-24 14:19 ` Esben Haabendal
2017-05-30  8:56 ` [PATCH v6 " Rasmus Villemoes
2017-05-30  8:56   ` [PATCH v6 1/3] watchdog: introduce watchdog_worker_should_ping helper Rasmus Villemoes
2017-05-30  8:56   ` [PATCH v6 2/3] watchdog: introduce watchdog.open_timeout commandline parameter Rasmus Villemoes
2017-07-08 15:12     ` [v6, " Guenter Roeck
2017-05-30  8:56   ` [PATCH v6 3/3] watchdog: introduce CONFIG_WATCHDOG_OPEN_TIMEOUT Rasmus Villemoes
2017-07-08 15:15     ` [v6,3/3] " Guenter Roeck
2017-07-11 15:50       ` Wim Van Sebroeck
2017-06-06  8:08   ` [PATCH v6 0/3] watchdog: allow setting deadline for opening /dev/watchdogN Rasmus Villemoes
2017-06-06 13:47     ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495462000-28979-2-git-send-email-rasmus.villemoes@prevas.dk \
    --to=rasmus.villemoes@prevas.dk \
    --cc=esben.haabendal@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=sebastian.reichel@collabora.co.uk \
    --cc=wim@iguana.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®