From: Wolfram Sang <wsa@the-dreams.de>
To: linux-watchdog@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: [PATCH 4/7] watchdog: softdog: remove forward declaration
Date: Wed, 25 May 2016 08:37:46 +0200 [thread overview]
Message-ID: <1464158269-2447-5-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1464158269-2447-1-git-send-email-wsa@the-dreams.de>
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/watchdog/softdog.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 0a29f5a0833787..42faa3d424d5ca 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -54,11 +54,6 @@ module_param(soft_panic, int, 0);
MODULE_PARM_DESC(soft_panic,
"Softdog action, set to 1 to panic, 0 to reboot (default=0)");
-static void softdog_fire(unsigned long);
-
-static struct timer_list softdog_ticktock =
- TIMER_INITIALIZER(softdog_fire, 0, 0);
-
static void softdog_fire(unsigned long data)
{
module_put(THIS_MODULE);
@@ -74,6 +69,9 @@ static void softdog_fire(unsigned long data)
}
}
+static struct timer_list softdog_ticktock =
+ TIMER_INITIALIZER(softdog_fire, 0, 0);
+
static int softdog_ping(struct watchdog_device *w)
{
if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ)))
--
2.8.1
next prev parent reply other threads:[~2016-05-25 6:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 6:37 [PATCH 0/7] watchdog: softdog: cleanups Wolfram Sang
2016-05-25 6:37 ` [PATCH 1/7] watchdog: softdog: remove obsolete comments Wolfram Sang
2016-05-25 17:30 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 2/7] watchdog: softdog: use watchdog core to init timeout value Wolfram Sang
2016-05-25 17:30 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 3/7] watchdog: softdog: consistently use softdog_ prefix Wolfram Sang
2016-05-25 17:30 ` Guenter Roeck
2016-05-25 6:37 ` Wolfram Sang [this message]
2016-05-25 17:31 ` [PATCH 4/7] watchdog: softdog: remove forward declaration Guenter Roeck
2016-05-25 6:37 ` [PATCH 5/7] watchdog: softdog: sort includes to avoid duplicates Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 6/7] watchdog: softdog: drop superfluous set_timeout callback Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 7/7] watchdog: softdog: improve coding style Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-07-17 19:48 ` [PATCH 0/7] watchdog: softdog: cleanups Wim Van Sebroeck
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=1464158269-2447-5-git-send-email-wsa@the-dreams.de \
--to=wsa@the-dreams.de \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/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;
as well as URLs for NNTP newsgroup(s).