AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] media: Unify IOCTL handler calling

Browse Source 
Each IOCTL handler can be listed in an array instead of using a large and
cumbersome switch. Do that.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sakari Ailus 2016-05-03 18:35:12 -03:00 committed by Mauro Carvalho Chehab
parent cf439d5f4d
commit 6975264c4c
1 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/media/media-device.c
View File

@ -419,20 +419,24 @@ static long media_device_get_topology(struct media_device *mdev,
return 0;
}
#define MEDIA_IOC(__cmd) \
[_IOC_NR(MEDIA_IOC_##__cmd)] = { .cmd = MEDIA_IOC_##__cmd }
#define MEDIA_IOC(__cmd, func) \
[_IOC_NR(MEDIA_IOC_##__cmd)] = { \
.cmd = MEDIA_IOC_##__cmd, \
.fn = (long (*)(struct media_device *, void __user *))func, \
}
/* the table is indexed by _IOC_NR(cmd) */
struct media_ioctl_info {
unsigned int cmd;
long (*fn)(struct media_device *dev, void __user *arg);
};
static const struct media_ioctl_info ioctl_info[] = {
MEDIA_IOC(DEVICE_INFO),
MEDIA_IOC(ENUM_ENTITIES),
MEDIA_IOC(ENUM_LINKS),
MEDIA_IOC(SETUP_LINK),
MEDIA_IOC(G_TOPOLOGY),
MEDIA_IOC(DEVICE_INFO, media_device_get_info),
MEDIA_IOC(ENUM_ENTITIES, media_device_enum_entities),
MEDIA_IOC(ENUM_LINKS, media_device_enum_links),
MEDIA_IOC(SETUP_LINK, media_device_setup_link),
MEDIA_IOC(G_TOPOLOGY, media_device_get_topology),
};
static long media_device_ioctl(struct file *filp, unsigned int cmd,
@ -440,42 +444,17 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd,
{
struct media_devnode *devnode = media_devnode_data(filp);
struct media_device *dev = devnode->media_dev;
const struct media_ioctl_info *info;
long ret;
if (_IOC_NR(cmd) >= ARRAY_SIZE(ioctl_info)
|| ioctl_info[_IOC_NR(cmd)].cmd != cmd)
return -ENOIOCTLCMD;
info = &ioctl_info[_IOC_NR(cmd)];
mutex_lock(&dev->graph_mutex);
switch (cmd) {
case MEDIA_IOC_DEVICE_INFO:
ret = media_device_get_info(dev,
(struct media_device_info __user *)arg);
break;
case MEDIA_IOC_ENUM_ENTITIES:
ret = media_device_enum_entities(dev,
(struct media_entity_desc __user *)arg);
break;
case MEDIA_IOC_ENUM_LINKS:
ret = media_device_enum_links(dev,
(struct media_links_enum __user *)arg);
break;
case MEDIA_IOC_SETUP_LINK:
ret = media_device_setup_link(dev,
(struct media_link_desc __user *)arg);
break;
case MEDIA_IOC_G_TOPOLOGY:
ret = media_device_get_topology(dev,
(struct media_v2_topology __user *)arg);
break;
default:
ret = -ENOIOCTLCMD;
}
ret = info->fn(dev, (void __user *)arg);
mutex_unlock(&dev->graph_mutex);
return ret;