From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: linux@roeck-us.net, andrew@lunn.ch, gregory.clement@bootlin.com,
jason@lakedaemon.net
Cc: linux-arm-kernel@lists.infradead.org,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Chris Packham <chris.packham@alliedtelesis.co.nz>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Subject: [PATCH 1/2] watchdog: orion_wdt: remove orion_wdt_set_timeout
Date: Tue, 5 Mar 2019 11:51:51 +1300 [thread overview]
Message-ID: <20190304225152.26831-2-chris.packham@alliedtelesis.co.nz> (raw)
In-Reply-To: <20190304225152.26831-1-chris.packham@alliedtelesis.co.nz>
The watchdog core will do the same thing if no set_timeout
is supplied so we can safely remove orion_wdt_set_timeout.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
drivers/watchdog/orion_wdt.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 9db3b09f7568..8b259c712c52 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -349,13 +349,6 @@ static unsigned int orion_wdt_get_timeleft(struct watchdog_device *wdt_dev)
return readl(dev->reg + dev->data->wdt_counter_offset) / dev->clk_rate;
}
-static int orion_wdt_set_timeout(struct watchdog_device *wdt_dev,
- unsigned int timeout)
-{
- wdt_dev->timeout = timeout;
- return 0;
-}
-
static const struct watchdog_info orion_wdt_info = {
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
.identity = "Orion Watchdog",
@@ -366,7 +359,6 @@ static const struct watchdog_ops orion_wdt_ops = {
.start = orion_wdt_start,
.stop = orion_wdt_stop,
.ping = orion_wdt_ping,
- .set_timeout = orion_wdt_set_timeout,
.get_timeleft = orion_wdt_get_timeleft,
};
--
2.21.0
next prev parent reply other threads:[~2019-03-04 22:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 2:29 [PATCH 0/3] getting more output from orion_wdt Chris Packham
2017-10-11 2:29 ` [PATCH 1/3] watchdog: orion: fix typo Chris Packham
2017-10-11 3:35 ` Guenter Roeck
2017-10-11 2:29 ` [PATCH 2/3] watchdog: orion: don't enable rstout if an interrupt is configured Chris Packham
2017-10-11 3:41 ` Guenter Roeck
2017-10-11 4:30 ` Chris Packham
2019-02-27 20:59 ` Chris Packham
2019-02-27 23:07 ` Guenter Roeck
2019-03-04 22:51 ` [PATCH 0/2] watchdog: orion_wdt: add pretimeout support Chris Packham
2019-03-04 22:51 ` Chris Packham [this message]
2019-03-05 17:17 ` [PATCH 1/2] watchdog: orion_wdt: remove orion_wdt_set_timeout Guenter Roeck
2019-03-04 22:51 ` [PATCH 2/2] watchdog: orion_wdt: use timer1 as a pretimeout Chris Packham
2019-03-05 0:57 ` Andrew Lunn
2019-03-05 1:26 ` Chris Packham
2019-03-05 2:09 ` Andrew Lunn
2019-03-05 17:27 ` Guenter Roeck
2017-10-11 2:29 ` [PATCH 3/3] ARM: mvebu: dts: connect interrupt for WD on armada-38x Chris Packham
2017-10-12 14:16 ` Gregory CLEMENT
2017-10-12 20:12 ` Chris Packham
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=20190304225152.26831-2-chris.packham@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=andrew@lunn.ch \
--cc=gregory.clement@bootlin.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/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).