Re: [PATCH v8 29/55] [media] replace all occurrences of MEDIA_ENT_T_DEVNODE_V4L

2015-08-31 Thread Hans Verkuil 
On 08/30/2015 05:06 AM, Mauro Carvalho Chehab wrote:
> 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
> 
> Signed-off-by: Mauro Carvalho Chehab 

Acked-by: Hans Verkuil 

> 
> diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml 
> b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> index 5872f8bbf774..910243d4edb8 100644
> --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> @@ -183,7 +183,7 @@
>   Unknown device node
> 
> 
> - MEDIA_ENT_T_DEVNODE_V4L
> + MEDIA_ENT_T_V4L2_VIDEO
>   V4L video, radio or vbi device node
> 
> 
> diff --git a/drivers/media/platform/xilinx/xilinx-dma.c 
> b/drivers/media/platform/xilinx/xilinx-dma.c
> index 92e8116dc28f..88cd789cdaf7 100644
> --- 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())) {
>   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 71a1b93b0790..44b330589787 100644
> --- a/drivers/media/v4l2-core/v4l2-dev.c
> +++ b/drivers/media/v4l2-core/v4l2-dev.c
> @@ -912,7 +912,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 83615b8fb46a..e6e1115d8215 100644
> --- 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);
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v8 29/55] [media] replace all occurrences of MEDIA_ENT_T_DEVNODE_V4L

2015-08-29 Thread Mauro Carvalho Chehab 
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

Signed-off-by: Mauro Carvalho Chehab mche...@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 5872f8bbf774..910243d4edb8 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -183,7 +183,7 @@
entryUnknown device node/entry
  /row
  row
-   entryconstantMEDIA_ENT_T_DEVNODE_V4L/constant/entry
+   entryconstantMEDIA_ENT_T_V4L2_VIDEO/constant/entry
entryV4L 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 92e8116dc28f..88cd789cdaf7 100644
--- 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 71a1b93b0790..44b330589787 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -912,7 +912,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 83615b8fb46a..e6e1115d8215 100644
--- 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);
 
-- 
2.4.3

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html