diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2015-01-27 18:16:56 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-28 19:19:34 (GMT) |
commit | 023e89c00b6d914d39b2e2cc48706a198e3a1d7a (patch) | |
tree | c37b67eda209d9d925797ba03770ea41016cd78a /drivers/staging/comedi/comedi_compat32.c | |
parent | 0ec14885de68bfeafe9b57f72a7b1ed1c9395bba (diff) | |
download | linux-023e89c00b6d914d39b2e2cc48706a198e3a1d7a.tar.xz |
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: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_compat32.c')
-rw-r--r-- | drivers/staging/comedi/comedi_compat32.c | 15 |
1 files 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); -} |