Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cb2ae5 authored by Oskar Schirmer's avatar Oskar Schirmer Committed by Wim Van Sebroeck
Browse files

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: default avatarOskar Schirmer <oskar@scara.com>
Acked-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 90fe6c60

drivers/char/ipmi/ipmi_watchdog.c

+0 −13
Original line number Diff line number Diff line
@@ -141,17 +141,6 @@ 


#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 bool nowayout = WATCHDOG_NOWAYOUT;
@@ -732,7 +721,6 @@ static int ipmi_ioctl(struct file *file, 
			return -EFAULT;

		return 0;



	case WDIOC_SET_PRETIMEOUT:

	case WDIOC_SETPRETIMEOUT:

		i = copy_from_user(&val, argp, sizeof(int));

		if (i)
@@ -740,7 +728,6 @@ static int ipmi_ioctl(struct file *file, 
		pretimeout = val;

		return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY);



	case WDIOC_GET_PRETIMEOUT:

	case WDIOC_GETPRETIMEOUT:

		i = copy_to_user(argp, &pretimeout, sizeof(pretimeout));

		if (i)