From: Jean Delvare <jdelvare@suse.de>
To: linux-watchdog@vger.kernel.org
Cc: Martin Wilck <mwilck@suse.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 2/2] watchdog: iTCO_wdt: Remove unused hooks
Date: Fri, 31 Aug 2018 15:07:34 +0200 [thread overview]
Message-ID: <20180831150734.2bc2fc02@endymion> (raw)
In-Reply-To: <20180831150610.0d3c5d9c@endymion>
As the only user of iTCO_vendor_pre_keepalive and
iTCO_vendor_pre_set_heartbeat has just been removed, we can delete
these 2 hooks.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Guenter Roeck <linux@roeck-us.net>
---
drivers/watchdog/iTCO_vendor.h | 4 ----
drivers/watchdog/iTCO_vendor_support.c | 10 ----------
drivers/watchdog/iTCO_wdt.c | 4 ----
3 files changed, 18 deletions(-)
--- linux-4.18.orig/drivers/watchdog/iTCO_vendor.h 2018-08-31 13:36:44.969460371 +0200
+++ linux-4.18/drivers/watchdog/iTCO_vendor.h 2018-08-31 14:37:19.197296115 +0200
@@ -3,14 +3,10 @@
#ifdef CONFIG_ITCO_VENDOR_SUPPORT
extern void iTCO_vendor_pre_start(struct resource *, unsigned int);
extern void iTCO_vendor_pre_stop(struct resource *);
-extern void iTCO_vendor_pre_keepalive(struct resource *, unsigned int);
-extern void iTCO_vendor_pre_set_heartbeat(unsigned int);
extern int iTCO_vendor_check_noreboot_on(void);
#else
#define iTCO_vendor_pre_start(acpibase, heartbeat) {}
#define iTCO_vendor_pre_stop(acpibase) {}
-#define iTCO_vendor_pre_keepalive(acpibase, heartbeat) {}
-#define iTCO_vendor_pre_set_heartbeat(heartbeat) {}
#define iTCO_vendor_check_noreboot_on() 1
/* 1=check noreboot; 0=don't check */
#endif
--- linux-4.18.orig/drivers/watchdog/iTCO_vendor_support.c 2018-08-31 14:27:06.438895718 +0200
+++ linux-4.18/drivers/watchdog/iTCO_vendor_support.c 2018-08-31 14:37:10.693180108 +0200
@@ -180,16 +180,6 @@ void iTCO_vendor_pre_stop(struct resourc
}
EXPORT_SYMBOL(iTCO_vendor_pre_stop);
-void iTCO_vendor_pre_keepalive(struct resource *smires, unsigned int heartbeat)
-{
-}
-EXPORT_SYMBOL(iTCO_vendor_pre_keepalive);
-
-void iTCO_vendor_pre_set_heartbeat(unsigned int heartbeat)
-{
-}
-EXPORT_SYMBOL(iTCO_vendor_pre_set_heartbeat);
-
int iTCO_vendor_check_noreboot_on(void)
{
switch (vendorsupport) {
--- linux-4.18.orig/drivers/watchdog/iTCO_wdt.c 2018-08-12 22:41:04.000000000 +0200
+++ linux-4.18/drivers/watchdog/iTCO_wdt.c 2018-08-31 14:38:19.295115483 +0200
@@ -304,8 +304,6 @@ static int iTCO_wdt_ping(struct watchdog
spin_lock(&p->io_lock);
- iTCO_vendor_pre_keepalive(p->smi_res, wd_dev->timeout);
-
/* Reload the timer by writing to the TCO Timer Counter register */
if (p->iTCO_version >= 2) {
outw(0x01, TCO_RLD(p));
@@ -342,8 +340,6 @@ static int iTCO_wdt_set_timeout(struct w
(p->iTCO_version == 1 && tmrval > 0x03f))
return -EINVAL;
- iTCO_vendor_pre_set_heartbeat(tmrval);
-
/* Write new heartbeat to watchdog */
if (p->iTCO_version >= 2) {
spin_lock(&p->io_lock);
--
Jean Delvare
SUSE L3 Support
next prev parent reply other threads:[~2018-08-31 13:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 13:06 [PATCH 1/2] watchdog: iTCO_wdt: Drop option vendorsupport=2 Jean Delvare
2018-08-31 13:07 ` Jean Delvare [this message]
2018-08-31 13:15 ` [PATCH 2/2] watchdog: iTCO_wdt: Remove unused hooks Guenter Roeck
2018-08-31 13:14 ` [PATCH 1/2] watchdog: iTCO_wdt: Drop option vendorsupport=2 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=20180831150734.2bc2fc02@endymion \
--to=jdelvare@suse.de \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mwilck@suse.com \
--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 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.