Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Oskar Schirmer and committed by
Wim Van Sebroeck
18cb2ae5 90fe6c60

-13
-13
drivers/char/ipmi/ipmi_watchdog.c
··· 141 141 142 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 144 static DEFINE_MUTEX(ipmi_watchdog_mutex); 156 145 static bool nowayout = WATCHDOG_NOWAYOUT; 157 146 ··· 721 732 return -EFAULT; 722 733 return 0; 723 734 724 - case WDIOC_SET_PRETIMEOUT: 725 735 case WDIOC_SETPRETIMEOUT: 726 736 i = copy_from_user(&val, argp, sizeof(int)); 727 737 if (i) ··· 728 740 pretimeout = val; 729 741 return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY); 730 742 731 - case WDIOC_GET_PRETIMEOUT: 732 743 case WDIOC_GETPRETIMEOUT: 733 744 i = copy_to_user(argp, &pretimeout, sizeof(pretimeout)); 734 745 if (i)