OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] replace all occurrences of MEDIA_ENT_T_DEVNODE_V4L 

Now that interfaces and entities are distinct, it makes no sense
of keeping something named as MEDIA_ENT_T_DEVNODE.

This change was done with this script:

	for i in $(git grep -l MEDIA_ENT_T|grep -v uapi/linux/media.h); do sed s,MEDIA_ENT_T_DEVNODE_V4L,MEDIA_ENT_T_V4L2_VIDEO, <$i >a && mv a $i; done

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-08-21 11:50:17 -03:00
parent 32fdc0e1a8
commit cf49066152
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
View File

@ -183,7 +183,7 @@
<entry>Unknown device node</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_DEVNODE_V4L</constant></entry>
<entry><constant>MEDIA_ENT_T_V4L2_VIDEO</constant></entry>
<entry>V4L video, radio or vbi device node</entry>
</row>
<row>

2
drivers/media/platform/xilinx/xilinx-dma.c
View File

@ -193,7 +193,7 @@ static int xvip_pipeline_validate(struct xvip_pipeline *pipe,
while ((entity = media_entity_graph_walk_next(&graph))) {
struct xvip_dma *dma;
if (entity->type != MEDIA_ENT_T_DEVNODE_V4L)
if (entity->type != MEDIA_ENT_T_V4L2_VIDEO)
continue;
dma = to_xvip_dma(media_entity_to_video_device(entity));

2
drivers/media/v4l2-core/v4l2-dev.c
View File

@ -922,7 +922,7 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
/* Part 5: Register the entity. */
if (vdev->v4l2_dev->mdev &&
vdev->vfl_type != VFL_TYPE_SUBDEV) {
vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L;
vdev->entity.type = MEDIA_ENT_T_V4L2_VIDEO;
vdev->entity.name = vdev->name;
vdev->entity.info.dev.major = VIDEO_MAJOR;
vdev->entity.info.dev.minor = vdev->minor;

2
drivers/media/v4l2-core/v4l2-subdev.c
View File

@ -535,7 +535,7 @@ v4l2_subdev_link_validate_get_format(struct media_pad *pad,
return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
}
WARN(pad->entity->type != MEDIA_ENT_T_DEVNODE_V4L,
WARN(pad->entity->type != MEDIA_ENT_T_V4L2_VIDEO,
"Driver bug! Wrong media entity type 0x%08x, entity %s\n",
pad->entity->type, pad->entity->name);