From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759262AbbA0SR1 (ORCPT ); Tue, 27 Jan 2015 13:17:27 -0500 Received: from smtp73.iad3a.emailsrvr.com ([173.203.187.73]:36448 "EHLO smtp73.iad3a.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759165AbbA0SRQ (ORCPT ); Tue, 27 Jan 2015 13:17:16 -0500 X-Sender-Id: abbotti@mev.co.uk From: Ian Abbott To: Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , Subject: [PATCH v2 6/6] staging: comedi: comedi_compat32.c: absorb raw_ioctl() Date: Tue, 27 Jan 2015 18:16:56 +0000 Message-Id: <1422382616-6884-7-git-send-email-abbotti@mev.co.uk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422382616-6884-1-git-send-email-abbotti@mev.co.uk> References: <1422373824-12793-1-git-send-email-abbotti@mev.co.uk> <1422382616-6884-1-git-send-email-abbotti@mev.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org `comedi_compat_ioctl()` just calls static inline function `raw_ioctl()` with the same parameters (although the former returns a `long` and the latter returns an `int`). Since `raw_ioctl()` is not called from anywhere else, just absorb its body into `comedi_compat_ioctl()`. Signed-off-by: Ian Abbott --- v2: no change --- drivers/staging/comedi/comedi_compat32.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c index 0eab6c6..2584824 100644 --- a/drivers/staging/comedi/comedi_compat32.c +++ b/drivers/staging/comedi/comedi_compat32.c @@ -410,12 +410,11 @@ static int compat_insn(struct file *file, unsigned long arg) } /* - * Process untranslated ioctl. + * compat_ioctl file operation. * * Returns -ENOIOCTLCMD for unrecognised ioctl codes. */ -static inline int raw_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) +long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int rc; @@ -462,13 +461,3 @@ static inline int raw_ioctl(struct file *file, unsigned int cmd, } return rc; } - -/* - * compat_ioctl file operation. - * - * Returns -ENOIOCTLCMD for unrecognised ioctl codes. - */ -long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) -{ - return raw_ioctl(file, cmd, arg); -} -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 403BD1C2967 for ; Tue, 27 Jan 2015 18:17:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3C08490D79 for ; Tue, 27 Jan 2015 18:17:17 +0000 (UTC) Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BE7auaDG60RZ for ; Tue, 27 Jan 2015 18:17:16 +0000 (UTC) Received: from smtp73.iad3a.emailsrvr.com (smtp73.iad3a.emailsrvr.com [173.203.187.73]) by whitealder.osuosl.org (Postfix) with ESMTPS id D2BAA90D58 for ; Tue, 27 Jan 2015 18:17:16 +0000 (UTC) From: Ian Abbott Subject: [PATCH v2 6/6] staging: comedi: comedi_compat32.c: absorb raw_ioctl() Date: Tue, 27 Jan 2015 18:16:56 +0000 Message-Id: <1422382616-6884-7-git-send-email-abbotti@mev.co.uk> In-Reply-To: <1422382616-6884-1-git-send-email-abbotti@mev.co.uk> References: <1422373824-12793-1-git-send-email-abbotti@mev.co.uk> <1422382616-6884-1-git-send-email-abbotti@mev.co.uk> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman , Ian Abbott , linux-kernel@vger.kernel.org `comedi_compat_ioctl()` just calls static inline function `raw_ioctl()` with the same parameters (although the former returns a `long` and the latter returns an `int`). Since `raw_ioctl()` is not called from anywhere else, just absorb its body into `comedi_compat_ioctl()`. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten --- v2: no change --- drivers/staging/comedi/comedi_compat32.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c index 0eab6c6..2584824 100644 --- a/drivers/staging/comedi/comedi_compat32.c +++ b/drivers/staging/comedi/comedi_compat32.c @@ -410,12 +410,11 @@ static int compat_insn(struct file *file, unsigned long arg) } /* - * Process untranslated ioctl. + * compat_ioctl file operation. * * Returns -ENOIOCTLCMD for unrecognised ioctl codes. */ -static inline int raw_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) +long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int rc; @@ -462,13 +461,3 @@ static inline int raw_ioctl(struct file *file, unsigned int cmd, } return rc; } - -/* - * compat_ioctl file operation. - * - * Returns -ENOIOCTLCMD for unrecognised ioctl codes. - */ -long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) -{ - return raw_ioctl(file, cmd, arg); -} -- 2.1.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel