From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753421Ab2FZTiI (ORCPT ); Tue, 26 Jun 2012 15:38:08 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:53896 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753091Ab2FZTiG (ORCPT ); Tue, 26 Jun 2012 15:38:06 -0400 Message-ID: <4FEA0F99.4030609@acm.org> Date: Tue, 26 Jun 2012 14:38:01 -0500 From: Corey Minyard Reply-To: minyard@acm.org User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Oskar Schirmer CC: linux-kernel@vger.kernel.org, Wim Van Sebroeck , Andrew Morton Subject: Re: [PATCH] char/ipmi: remove local ioctl defines replaced by generic ones References: <1338456523-12390-1-git-send-email-oskar@scara.com> In-Reply-To: <1338456523-12390-1-git-send-email-oskar@scara.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Looks good to me... Acked-by: Corey Minyard 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 > Cc: Corey Minyard > Cc: Wim Van Sebroeck > Cc: Andrew Morton > --- > 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)