diff options
Diffstat (limited to 'drivers/watchdog/iTCO_vendor_support.c')
-rw-r--r-- | drivers/watchdog/iTCO_vendor_support.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c index 5133bca5ccb..481d1ad4346 100644 --- a/drivers/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c | |||
@@ -101,13 +101,6 @@ static void supermicro_old_pre_stop(unsigned long acpibase) | |||
101 | outl(val32, SMI_EN); /* Needed to deactivate watchdog */ | 101 | outl(val32, SMI_EN); /* Needed to deactivate watchdog */ |
102 | } | 102 | } |
103 | 103 | ||
104 | static void supermicro_old_pre_keepalive(unsigned long acpibase) | ||
105 | { | ||
106 | /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */ | ||
107 | /* Clear "Expire Flag" (Bit 3 of TC01_STS register) */ | ||
108 | outb(0x08, TCO1_STS); | ||
109 | } | ||
110 | |||
111 | /* | 104 | /* |
112 | * Vendor Support: 2 | 105 | * Vendor Support: 2 |
113 | * Board: Super Micro Computer Inc. P4SBx, P4DPx | 106 | * Board: Super Micro Computer Inc. P4SBx, P4DPx |
@@ -337,9 +330,7 @@ EXPORT_SYMBOL(iTCO_vendor_pre_stop); | |||
337 | 330 | ||
338 | void iTCO_vendor_pre_keepalive(unsigned long acpibase, unsigned int heartbeat) | 331 | void iTCO_vendor_pre_keepalive(unsigned long acpibase, unsigned int heartbeat) |
339 | { | 332 | { |
340 | if (vendorsupport == SUPERMICRO_OLD_BOARD) | 333 | if (vendorsupport == SUPERMICRO_NEW_BOARD) |
341 | supermicro_old_pre_keepalive(acpibase); | ||
342 | else if (vendorsupport == SUPERMICRO_NEW_BOARD) | ||
343 | supermicro_new_pre_set_heartbeat(heartbeat); | 334 | supermicro_new_pre_set_heartbeat(heartbeat); |
344 | } | 335 | } |
345 | EXPORT_SYMBOL(iTCO_vendor_pre_keepalive); | 336 | EXPORT_SYMBOL(iTCO_vendor_pre_keepalive); |