diff options
-rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 7ed356e52035..37b8be7cba95 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
@@ -141,17 +141,6 @@ | |||
141 | 141 | ||
142 | #define IPMI_WDOG_TIMER_NOT_INIT_RESP 0x80 | 142 | #define IPMI_WDOG_TIMER_NOT_INIT_RESP 0x80 |
143 | 143 | ||
144 | /* These are here until the real ones get into the watchdog.h interface. */ | ||
145 | #ifndef WDIOC_GETTIMEOUT | ||
146 | #define WDIOC_GETTIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 20, int) | ||
147 | #endif | ||
148 | #ifndef WDIOC_SET_PRETIMEOUT | ||
149 | #define WDIOC_SET_PRETIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 21, int) | ||
150 | #endif | ||
151 | #ifndef WDIOC_GET_PRETIMEOUT | ||
152 | #define WDIOC_GET_PRETIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 22, int) | ||
153 | #endif | ||
154 | |||
155 | static DEFINE_MUTEX(ipmi_watchdog_mutex); | 144 | static DEFINE_MUTEX(ipmi_watchdog_mutex); |
156 | static bool nowayout = WATCHDOG_NOWAYOUT; | 145 | static bool nowayout = WATCHDOG_NOWAYOUT; |
157 | 146 | ||
@@ -732,7 +721,6 @@ static int ipmi_ioctl(struct file *file, | |||
732 | return -EFAULT; | 721 | return -EFAULT; |
733 | return 0; | 722 | return 0; |
734 | 723 | ||
735 | case WDIOC_SET_PRETIMEOUT: | ||
736 | case WDIOC_SETPRETIMEOUT: | 724 | case WDIOC_SETPRETIMEOUT: |
737 | i = copy_from_user(&val, argp, sizeof(int)); | 725 | i = copy_from_user(&val, argp, sizeof(int)); |
738 | if (i) | 726 | if (i) |
@@ -740,7 +728,6 @@ static int ipmi_ioctl(struct file *file, | |||
740 | pretimeout = val; | 728 | pretimeout = val; |
741 | return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY); | 729 | return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY); |
742 | 730 | ||
743 | case WDIOC_GET_PRETIMEOUT: | ||
744 | case WDIOC_GETPRETIMEOUT: | 731 | case WDIOC_GETPRETIMEOUT: |
745 | i = copy_to_user(argp, &pretimeout, sizeof(pretimeout)); | 732 | i = copy_to_user(argp, &pretimeout, sizeof(pretimeout)); |
746 | if (i) | 733 | if (i) |