diff options
| author |   Jean Delvare <jdelvare@suse.de> | 2018-08-31 15:07:34 +0200 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@linux-watchdog.org> | 2018-10-02 13:32:25 +0200 |
| commit | 5a623ce0a55ed32fd999a80d0423cfae782893dc (patch) | |
| tree | 61544c09ea568f29d09a9fbf84cbd2d9b30d514f /drivers/watchdog | |
| parent | watchdog: iTCO_wdt: Drop option vendorsupport=2 (diff) | |
| download | linux-dev-5a623ce0a55ed32fd999a80d0423cfae782893dc.tar.xz linux-dev-5a623ce0a55ed32fd999a80d0423cfae782893dc.zip | |
watchdog: iTCO_wdt: Remove unused hooks
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>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/iTCO_vendor.h | 4 | ||||
| -rw-r--r-- | drivers/watchdog/iTCO_vendor_support.c | 10 | ||||
| -rw-r--r-- | drivers/watchdog/iTCO_wdt.c | 4 |
3 files changed, 0 insertions, 18 deletions
diff --git a/drivers/watchdog/iTCO_vendor.h b/drivers/watchdog/iTCO_vendor.h index 7b82a7c6e7c3..0f7373ba10d5 100644 --- a/drivers/watchdog/iTCO_vendor.h +++ b/drivers/watchdog/iTCO_vendor.h @@ -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 diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c index d714a06de57c..68a9d9cc2eb8 100644 --- a/drivers/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c @@ -180,16 +180,6 @@ void iTCO_vendor_pre_stop(struct resource *smires) } 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) { diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 347f0389b089..0a5318b7865e 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -304,8 +304,6 @@ static int iTCO_wdt_ping(struct watchdog_device *wd_dev) 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 watchdog_device *wd_dev, unsigned int t) (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); |