提交 023e89c0 编写于 作者: I Ian Abbott 提交者: Greg Kroah-Hartman

staging: comedi: comedi_compat32.c: absorb raw_ioctl()

`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: NIan Abbott <abbotti@mev.co.uk>
Reviewed-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 0ec14885
...@@ -410,12 +410,11 @@ static int compat_insn(struct file *file, unsigned long arg) ...@@ -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. * Returns -ENOIOCTLCMD for unrecognised ioctl codes.
*/ */
static inline int raw_ioctl(struct file *file, unsigned int cmd, long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned long arg)
{ {
int rc; int rc;
...@@ -462,13 +461,3 @@ static inline int raw_ioctl(struct file *file, unsigned int cmd, ...@@ -462,13 +461,3 @@ static inline int raw_ioctl(struct file *file, unsigned int cmd,
} }
return rc; 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);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册