2012-05-31 09:28:48

by Oskar Schirmer

Subject: [PATCH] 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 <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: Wim Van Sebroeck <[email protected]>
Cc: Andrew Morton <[email protected]>
---
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 7ed356e..37b8be7 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -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)
--
1.7.5.4

2012-06-26 18:52:48

by Wim Van Sebroeck

Subject: Re: [PATCH] char/ipmi: remove local ioctl defines replaced by generic ones

Hi Oskar,

> 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 <[email protected]>
> Cc: Corey Minyard <[email protected]>
> Cc: Wim Van Sebroeck <[email protected]>
> Cc: Andrew Morton <[email protected]>

Added to linux-watchdog-next.

Kind regards,
Wim.

2012-06-26 19:38:08

by Corey Minyard

Subject: Re: [PATCH] char/ipmi: remove local ioctl defines replaced by generic ones

Looks good to me...

Acked-by: Corey Minyard <[email protected]>


On 05/31/2012 04:28 AM, Oskar Schirmer wrote:
> 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<[email protected]>
> Cc: Corey Minyard<[email protected]>
> Cc: Wim Van Sebroeck<[email protected]>
> Cc: Andrew Morton<[email protected]>
> ---
> 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 7ed356e..37b8be7 100644
> --- a/drivers/char/ipmi/ipmi_watchdog.c
> +++ b/drivers/char/ipmi/ipmi_watchdog.c
> @@ -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)