Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 023e89c0 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ec14885

drivers/staging/comedi/comedi_compat32.c

+2 −13
Original line number Diff line number Diff line
@@ -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);

}