mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
char/ipmi: remove local ioctl defines replaced by generic ones
This watchdog driver had ioctl defines introduced locally
for pre timeout handling, marked to be removed as soon as
a generic replacement would become available.
The latter has actually occurred in 2006, at e05b59fe
.
Remove the local duplicates for pre timeout handling.
Signed-off-by: Oskar Schirmer <oskar@scara.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
90fe6c608f
commit
18cb2ae55f
1 changed files with 0 additions and 13 deletions
|
@ -141,17 +141,6 @@
|
||||||
|
|
||||||
#define IPMI_WDOG_TIMER_NOT_INIT_RESP 0x80
|
#define IPMI_WDOG_TIMER_NOT_INIT_RESP 0x80
|
||||||
|
|
||||||
/* These are here until the real ones get into the watchdog.h interface. */
|
|
||||||
#ifndef WDIOC_GETTIMEOUT
|
|
||||||
#define WDIOC_GETTIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 20, int)
|
|
||||||
#endif
|
|
||||||
#ifndef WDIOC_SET_PRETIMEOUT
|
|
||||||
#define WDIOC_SET_PRETIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 21, int)
|
|
||||||
#endif
|
|
||||||
#ifndef WDIOC_GET_PRETIMEOUT
|
|
||||||
#define WDIOC_GET_PRETIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 22, int)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static DEFINE_MUTEX(ipmi_watchdog_mutex);
|
static DEFINE_MUTEX(ipmi_watchdog_mutex);
|
||||||
static bool nowayout = WATCHDOG_NOWAYOUT;
|
static bool nowayout = WATCHDOG_NOWAYOUT;
|
||||||
|
|
||||||
|
@ -732,7 +721,6 @@ static int ipmi_ioctl(struct file *file,
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case WDIOC_SET_PRETIMEOUT:
|
|
||||||
case WDIOC_SETPRETIMEOUT:
|
case WDIOC_SETPRETIMEOUT:
|
||||||
i = copy_from_user(&val, argp, sizeof(int));
|
i = copy_from_user(&val, argp, sizeof(int));
|
||||||
if (i)
|
if (i)
|
||||||
|
@ -740,7 +728,6 @@ static int ipmi_ioctl(struct file *file,
|
||||||
pretimeout = val;
|
pretimeout = val;
|
||||||
return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
|
return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);
|
||||||
|
|
||||||
case WDIOC_GET_PRETIMEOUT:
|
|
||||||
case WDIOC_GETPRETIMEOUT:
|
case WDIOC_GETPRETIMEOUT:
|
||||||
i = copy_to_user(argp, &pretimeout, sizeof(pretimeout));
|
i = copy_to_user(argp, &pretimeout, sizeof(pretimeout));
|
||||||
if (i)
|
if (i)
|
||||||
|
|
Loading…
Reference in a new issue