aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/v4l2-dev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-10 14:25:41 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 09:19:01 -0500
commit4ca72efaeffd0d244c44307abc9d4cb11f8ad475 (patch)
treeae953c05584fabbae89814a148410021160e0ab5 /drivers/media/v4l2-core/v4l2-dev.c
parentd87cdb884486bfa795be99c83a5b3ac4d428ca84 (diff)
[media] uapi/media.h: Rename entities types to functions
Rename the userspace types from MEDIA_ENT_T_ to MEDIA_ENT_F_ and add the backward compatibility bits. The changes at the .c files was generated by the following coccinelle script: @@ @@ -MEDIA_ENT_T_UNKNOWN +MEDIA_ENT_F_UNKNOWN @@ @@ -MEDIA_ENT_T_DVB_BASE +MEDIA_ENT_F_DVB_BASE @@ @@ -MEDIA_ENT_T_V4L2_BASE +MEDIA_ENT_F_V4L2_BASE @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_BASE +MEDIA_ENT_F_V4L2_SUBDEV_BASE @@ @@ -MEDIA_ENT_T_CONNECTOR_BASE +MEDIA_ENT_F_CONNECTOR_BASE @@ @@ -MEDIA_ENT_T_V4L2_VIDEO +MEDIA_ENT_F_IO_V4L @@ @@ -MEDIA_ENT_T_V4L2_VBI +MEDIA_ENT_F_IO_VBI @@ @@ -MEDIA_ENT_T_V4L2_SWRADIO +MEDIA_ENT_F_IO_SWRADIO @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN +MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN @@ @@ -MEDIA_ENT_T_CONN_RF +MEDIA_ENT_F_CONN_RF @@ @@ -MEDIA_ENT_T_CONN_SVIDEO +MEDIA_ENT_F_CONN_SVIDEO @@ @@ -MEDIA_ENT_T_CONN_COMPOSITE +MEDIA_ENT_F_CONN_COMPOSITE @@ @@ -MEDIA_ENT_T_CONN_TEST +MEDIA_ENT_F_CONN_TEST @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_SENSOR +MEDIA_ENT_F_CAM_SENSOR @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_FLASH +MEDIA_ENT_F_FLASH @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_LENS +MEDIA_ENT_F_LENS @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_DECODER +MEDIA_ENT_F_ATV_DECODER @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_TUNER +MEDIA_ENT_F_TUNER @@ @@ -MEDIA_ENT_T_DVB_DEMOD +MEDIA_ENT_F_DTV_DEMOD @@ @@ -MEDIA_ENT_T_DVB_DEMUX +MEDIA_ENT_F_TS_DEMUX @@ @@ -MEDIA_ENT_T_DVB_TSOUT +MEDIA_ENT_F_IO_DTV @@ @@ -MEDIA_ENT_T_DVB_CA +MEDIA_ENT_F_DTV_CA @@ @@ -MEDIA_ENT_T_DVB_NET_DECAP +MEDIA_ENT_F_DTV_NET_DECAP Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-dev.c')
-rw-r--r--drivers/media/v4l2-core/v4l2-dev.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 965449958e97..ed96642c27bf 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -197,7 +197,7 @@ static void v4l2_device_release(struct device *cd)
197 if (v4l2_dev->mdev) { 197 if (v4l2_dev->mdev) {
198 /* Remove interfaces and interface links */ 198 /* Remove interfaces and interface links */
199 media_devnode_remove(vdev->intf_devnode); 199 media_devnode_remove(vdev->intf_devnode);
200 if (vdev->entity.function != MEDIA_ENT_T_UNKNOWN) 200 if (vdev->entity.function != MEDIA_ENT_F_UNKNOWN)
201 media_device_unregister_entity(&vdev->entity); 201 media_device_unregister_entity(&vdev->entity);
202 } 202 }
203#endif 203#endif
@@ -735,20 +735,20 @@ static int video_register_media_controller(struct video_device *vdev, int type)
735 if (!vdev->v4l2_dev->mdev) 735 if (!vdev->v4l2_dev->mdev)
736 return 0; 736 return 0;
737 737
738 vdev->entity.function = MEDIA_ENT_T_UNKNOWN; 738 vdev->entity.function = MEDIA_ENT_F_UNKNOWN;
739 739
740 switch (type) { 740 switch (type) {
741 case VFL_TYPE_GRABBER: 741 case VFL_TYPE_GRABBER:
742 intf_type = MEDIA_INTF_T_V4L_VIDEO; 742 intf_type = MEDIA_INTF_T_V4L_VIDEO;
743 vdev->entity.function = MEDIA_ENT_T_V4L2_VIDEO; 743 vdev->entity.function = MEDIA_ENT_F_IO_V4L;
744 break; 744 break;
745 case VFL_TYPE_VBI: 745 case VFL_TYPE_VBI:
746 intf_type = MEDIA_INTF_T_V4L_VBI; 746 intf_type = MEDIA_INTF_T_V4L_VBI;
747 vdev->entity.function = MEDIA_ENT_T_V4L2_VBI; 747 vdev->entity.function = MEDIA_ENT_F_IO_VBI;
748 break; 748 break;
749 case VFL_TYPE_SDR: 749 case VFL_TYPE_SDR:
750 intf_type = MEDIA_INTF_T_V4L_SWRADIO; 750 intf_type = MEDIA_INTF_T_V4L_SWRADIO;
751 vdev->entity.function = MEDIA_ENT_T_V4L2_SWRADIO; 751 vdev->entity.function = MEDIA_ENT_F_IO_SWRADIO;
752 break; 752 break;
753 case VFL_TYPE_RADIO: 753 case VFL_TYPE_RADIO:
754 intf_type = MEDIA_INTF_T_V4L_RADIO; 754 intf_type = MEDIA_INTF_T_V4L_RADIO;
@@ -766,7 +766,7 @@ static int video_register_media_controller(struct video_device *vdev, int type)
766 return 0; 766 return 0;
767 } 767 }
768 768
769 if (vdev->entity.function != MEDIA_ENT_T_UNKNOWN) { 769 if (vdev->entity.function != MEDIA_ENT_F_UNKNOWN) {
770 vdev->entity.name = vdev->name; 770 vdev->entity.name = vdev->name;
771 771
772 /* Needed just for backward compatibility with legacy MC API */ 772 /* Needed just for backward compatibility with legacy MC API */
@@ -793,7 +793,7 @@ static int video_register_media_controller(struct video_device *vdev, int type)
793 return -ENOMEM; 793 return -ENOMEM;
794 } 794 }
795 795
796 if (vdev->entity.function != MEDIA_ENT_T_UNKNOWN) { 796 if (vdev->entity.function != MEDIA_ENT_F_UNKNOWN) {
797 struct media_link *link; 797 struct media_link *link;
798 798
799 link = media_create_intf_link(&vdev->entity, 799 link = media_create_intf_link(&vdev->entity,