[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>

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index 5872f8bbf7747efb848daf103b3d70271b18e1c6..910243d4edb837d6581799bb31ab777a17a28cf8 100644 (file)
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -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>

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 4b84a0e54a0cd3607c432b5af579a6546fc094d8..9c8b2725425361878130fdff7ae273d0921e3eaa 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -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));

diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 6b1eaeddbdb3c9d973866ecb28aab9f24f379e41..2297571a0568a8fa13a5e125a169b1c79427d291 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -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;

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 83615b8fb46add402cf5bee98bc4936c6e9cc368..e6e1115d82150b1effa865b1be2d593b7418be33 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -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);