diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-10 14:25:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 09:19:01 -0500 |
commit | 4ca72efaeffd0d244c44307abc9d4cb11f8ad475 (patch) | |
tree | ae953c05584fabbae89814a148410021160e0ab5 /drivers/media/v4l2-core/v4l2-subdev.c | |
parent | d87cdb884486bfa795be99c83a5b3ac4d428ca84 (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-subdev.c')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-subdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index b440cb66669c..d63083803144 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, | |||
535 | return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt); | 535 | return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt); |
536 | } | 536 | } |
537 | 537 | ||
538 | WARN(pad->entity->function != MEDIA_ENT_T_V4L2_VIDEO, | 538 | WARN(pad->entity->function != MEDIA_ENT_F_IO_V4L, |
539 | "Driver bug! Wrong media entity type 0x%08x, entity %s\n", | 539 | "Driver bug! Wrong media entity type 0x%08x, entity %s\n", |
540 | pad->entity->function, pad->entity->name); | 540 | pad->entity->function, pad->entity->name); |
541 | 541 | ||
@@ -584,7 +584,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops) | |||
584 | sd->host_priv = NULL; | 584 | sd->host_priv = NULL; |
585 | #if defined(CONFIG_MEDIA_CONTROLLER) | 585 | #if defined(CONFIG_MEDIA_CONTROLLER) |
586 | sd->entity.name = sd->name; | 586 | sd->entity.name = sd->name; |
587 | sd->entity.function = MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN; | 587 | sd->entity.function = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN; |
588 | #endif | 588 | #endif |
589 | } | 589 | } |
590 | EXPORT_SYMBOL(v4l2_subdev_init); | 590 | EXPORT_SYMBOL(v4l2_subdev_init); |