1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index f6fc95d1345b..f64e8b3fb687 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -242,7 +242,7 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev,
                 if (!entity->name)
                         return -ENOMEM;
 
-                entity->function = MEDIA_ENT_T_DVB_TSOUT;
+                entity->function = MEDIA_ENT_F_IO_DTV;
                 pads->flags = MEDIA_PAD_FL_SINK;
 
                 ret = media_entity_init(entity, 1, pads);
@@ -315,18 +315,18 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
 
         switch (type) {
         case DVB_DEVICE_FRONTEND:
-                dvbdev->entity->function = MEDIA_ENT_T_DVB_DEMOD;
+                dvbdev->entity->function = MEDIA_ENT_F_DTV_DEMOD;
                 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
                 dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;
                 break;
         case DVB_DEVICE_DEMUX:
-                dvbdev->entity->function = MEDIA_ENT_T_DVB_DEMUX;
+                dvbdev->entity->function = MEDIA_ENT_F_TS_DEMUX;
                 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
                 for (i = 1; i < npads; i++)
                         dvbdev->pads[i].flags = MEDIA_PAD_FL_SOURCE;
                 break;
         case DVB_DEVICE_CA:
-                dvbdev->entity->function = MEDIA_ENT_T_DVB_CA;
+                dvbdev->entity->function = MEDIA_ENT_F_DTV_CA;
                 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
                 dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;
                 break;
@@ -556,16 +556,16 @@ int dvb_create_media_graph(struct dvb_adapter *adap)
 
         media_device_for_each_entity(entity, mdev) {
                 switch (entity->function) {
-                case MEDIA_ENT_T_V4L2_SUBDEV_TUNER:
+                case MEDIA_ENT_F_TUNER:
                         tuner = entity;
                         break;
-                case MEDIA_ENT_T_DVB_DEMOD:
+                case MEDIA_ENT_F_DTV_DEMOD:
                         demod = entity;
                         break;
-                case MEDIA_ENT_T_DVB_DEMUX:
+                case MEDIA_ENT_F_TS_DEMUX:
                         demux = entity;
                         break;
-                case MEDIA_ENT_T_DVB_CA:
+                case MEDIA_ENT_F_DTV_CA:
                         ca = entity;
                         break;
                 }
@@ -594,7 +594,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap)
         /* Create demux links for each ringbuffer/pad */
         if (demux) {
                 media_device_for_each_entity(entity, mdev) {
-                        if (entity->function == MEDIA_ENT_T_DVB_TSOUT) {
+                        if (entity->function == MEDIA_ENT_F_IO_DTV) {
                                 if (!strncmp(entity->name, DVR_TSOUT,
                                     strlen(DVR_TSOUT))) {
                                         ret = media_create_pad_link(demux,
@@ -639,7 +639,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap)
                 }
 
                 media_device_for_each_entity(entity, mdev) {
-                        if (entity->function == MEDIA_ENT_T_DVB_TSOUT) {
+                        if (entity->function == MEDIA_ENT_F_IO_DTV) {
                                 if (!strcmp(entity->name, DVR_TSOUT)) {
                                         link = media_create_intf_link(entity,
                                                         intf,