Commit 5a623ce0 authored by Jean Delvare's avatar Jean Delvare Committed by Wim Van Sebroeck
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
Cc: Martin Wilck <mwilck@suse.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 2c05318a

drivers/watchdog/iTCO_vendor.h

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/watchdog/iTCO_vendor_support.c

+0 −10
Original line number Diff line number Diff line
@@ -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) {

drivers/watchdog/iTCO_wdt.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE