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

Commit cf490661 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 32fdc0e1

Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/media/platform/xilinx/xilinx-dma.c

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

drivers/media/v4l2-core/v4l2-dev.c

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

drivers/media/v4l2-core/v4l2-subdev.c

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