From: Guenter Roeck <linux@roeck-us.net>
To: linux-watchdog@vger.kernel.org
Cc: "Wim Van Sebroeck" <wim@iguana.be>,
linux-kernel@vger.kernel.org,
"Timo Kokkonen" <timo.kokkonen@offcode.fi>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-doc@vger.kernel.org, "Jonathan Corbet" <corbet@lwn.net>,
"Guenter Roeck" <linux@roeck-us.net>
Subject: [PATCH v5 5/8] watchdog: Simplify update_worker
Date: Sun, 22 Nov 2015 19:21:02 -0800 [thread overview]
Message-ID: <1448248865-21684-6-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1448248865-21684-1-git-send-email-linux@roeck-us.net>
Drop 'cancel' parameter; simply cancel worker unconditionally
if not needed.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v5: Added patch.
drivers/watchdog/watchdog_dev.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 832bd5ac15b5..722ea86fcc7c 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -96,15 +96,14 @@ static long watchdog_next_keepalive(struct watchdog_device *wdd)
return min_t(long, last_heartbeat - jiffies, keepalive_interval);
}
-static inline void watchdog_update_worker(struct watchdog_device *wdd,
- bool cancel)
+static inline void watchdog_update_worker(struct watchdog_device *wdd)
{
if (watchdog_need_worker(wdd)) {
long t = watchdog_next_keepalive(wdd);
if (t > 0)
mod_delayed_work(watchdog_wq, &wdd->work, t);
- } else if (cancel) {
+ } else {
cancel_delayed_work(&wdd->work);
}
}
@@ -133,7 +132,7 @@ static int _watchdog_ping(struct watchdog_device *wdd)
else
err = wdd->ops->start(wdd); /* restart watchdog */
- watchdog_update_worker(wdd, false);
+ watchdog_update_worker(wdd);
return err;
}
@@ -198,7 +197,7 @@ static int watchdog_start(struct watchdog_device *wdd)
if (err == 0) {
set_bit(WDOG_ACTIVE, &wdd->status);
wdd->last_keepalive = jiffies;
- watchdog_update_worker(wdd, true);
+ watchdog_update_worker(wdd);
}
out_start:
@@ -243,7 +242,7 @@ static int watchdog_stop(struct watchdog_device *wdd)
if (err == 0) {
clear_bit(WDOG_ACTIVE, &wdd->status);
- watchdog_update_worker(wdd, true);
+ watchdog_update_worker(wdd);
}
out_stop:
@@ -311,7 +310,7 @@ static int watchdog_set_timeout(struct watchdog_device *wdd,
else
wdd->timeout = timeout;
- watchdog_update_worker(wdd, true);
+ watchdog_update_worker(wdd);
out_timeout:
mutex_unlock(&wdd->lock);
@@ -590,7 +589,7 @@ static int watchdog_release(struct inode *inode, struct file *file)
}
cancel_delayed_work_sync(&wdd->work);
- watchdog_update_worker(wdd, false);
+ watchdog_update_worker(wdd);
/*
* Allow the owner module to be unloaded again unless the watchdog
--
2.1.4
next prev parent reply other threads:[~2015-11-23 3:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 3:20 [PATCH v5 0/8] watchdog: Add support for keepalives triggered by infrastructure Guenter Roeck
2015-11-23 3:20 ` [PATCH v5 1/8] watchdog: Introduce hardware maximum timeout in watchdog core Guenter Roeck
2015-11-23 7:53 ` Uwe Kleine-König
2015-11-23 16:14 ` Guenter Roeck
2015-11-23 18:26 ` Uwe Kleine-König
2015-11-23 21:55 ` Guenter Roeck
2015-11-24 7:16 ` Uwe Kleine-König
2015-11-24 15:03 ` Guenter Roeck
2015-11-24 16:11 ` Uwe Kleine-König
2015-11-24 16:45 ` Guenter Roeck
2015-11-24 21:14 ` Uwe Kleine-König
2015-11-23 3:20 ` [PATCH v5 2/8] watchdog: Introduce WDOG_RUNNING flag Guenter Roeck
2015-11-23 16:30 ` Alexander Stein
2015-11-23 16:42 ` Guenter Roeck
2015-11-23 19:26 ` Uwe Kleine-König
2015-11-23 21:48 ` Guenter Roeck
2015-11-23 3:21 ` [PATCH v5 3/8] watchdog: Make set_timeout function optional Guenter Roeck
2015-11-23 3:21 ` [PATCH v5 4/8] watchdog: Add support for minimum time between heartbeats Guenter Roeck
2015-11-23 3:21 ` Guenter Roeck [this message]
2015-11-24 7:13 ` [PATCH v5 5/8] watchdog: Simplify update_worker Uwe Kleine-König
2015-11-24 7:25 ` Guenter Roeck
2015-11-23 3:21 ` [RFT PATCH v5 6/8] watchdog: imx2: Convert to use infrastructure triggered keepalives Guenter Roeck
2015-11-23 3:21 ` [RFT PATCH v5 7/8] watchdog: retu: " Guenter Roeck
2015-11-23 3:21 ` [RFT PATCH v5 8/8] watchdog: at91sam9: " 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=1448248865-21684-6-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=timo.kokkonen@offcode.fi \
--cc=u.kleine-koenig@pengutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.