From f73696275e64d55c59947b42979b531cb026d718 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 21 Mar 2016 09:19:31 -0300 Subject: [media] media-device: Simplify compat32 logic Only MEDIA_IOC_ENUM_LINKS32 require an special logic when userspace is 32 bits and Kernel is 64 bits. For the rest, media_device_ioctl() will do the right thing, and will return -ENOIOCTLCMD if the ioctl is unknown. Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- drivers/media/media-device.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'drivers/media/media-device.c') diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index de92a6bf3751..47a99af5525e 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -499,12 +499,6 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, long ret; switch (cmd) { - case MEDIA_IOC_DEVICE_INFO: - case MEDIA_IOC_ENUM_ENTITIES: - case MEDIA_IOC_SETUP_LINK: - case MEDIA_IOC_G_TOPOLOGY: - return media_device_ioctl(filp, cmd, arg); - case MEDIA_IOC_ENUM_LINKS32: mutex_lock(&dev->graph_mutex); ret = media_device_enum_links32(dev, @@ -513,7 +507,7 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, break; default: - ret = -ENOIOCTLCMD; + return media_device_ioctl(filp, cmd, arg); } return ret; -- cgit v1.2.3