linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 6/7] watchdog: softdog: drop superfluous set_timeout callback
Date: Wed, 25 May 2016 08:37:48 +0200	[thread overview]
Message-ID: <1464158269-2447-7-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>

If we leave set_timeout empty, the core will do exactly what is
implemented here anyway.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/watchdog/softdog.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index ab0e02fc81a276..5e3a30b99d4415 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -87,12 +87,6 @@ static int softdog_stop(struct watchdog_device *w)
 	return 0;
 }
 
-static int softdog_set_timeout(struct watchdog_device *w, unsigned int t)
-{
-	w->timeout = t;
-	return 0;
-}
-
 static struct watchdog_info softdog_info = {
 	.identity = "Software Watchdog",
 	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
@@ -102,7 +96,6 @@ static struct watchdog_ops softdog_ops = {
 	.owner = THIS_MODULE,
 	.start = softdog_ping,
 	.stop = softdog_stop,
-	.set_timeout = softdog_set_timeout,
 };
 
 static struct watchdog_device softdog_dev = {
-- 
2.8.1


  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 ` [PATCH 4/7] watchdog: softdog: remove forward declaration Wolfram Sang
2016-05-25 17:31   ` 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 ` Wolfram Sang [this message]
2016-05-25 17:31   ` [PATCH 6/7] watchdog: softdog: drop superfluous set_timeout callback 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-7-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).