Commit 4ca72efa authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d87cdb88

drivers/media/dvb-core/dvbdev.c

+10 −10
Original line number Diff line number Diff line
@@ -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,

drivers/media/dvb-frontends/au8522_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static int au8522_probe(struct i2c_client *client, 
	state->pads[AU8522_PAD_INPUT].flags = MEDIA_PAD_FL_SINK;

	state->pads[AU8522_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;

	state->pads[AU8522_PAD_VBI_OUT].flags = MEDIA_PAD_FL_SOURCE;

	sd->entity.function = MEDIA_ENT_T_V4L2_SUBDEV_DECODER;

	sd->entity.function = MEDIA_ENT_F_ATV_DECODER;



	ret = media_entity_init(&sd->entity, ARRAY_SIZE(state->pads),

				state->pads);

drivers/media/i2c/adp1653.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int adp1653_probe(struct i2c_client *client, 
	if (ret < 0)

		goto free_and_quit;



	flash->subdev.entity.function = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;

	flash->subdev.entity.function = MEDIA_ENT_F_FLASH;



	return 0;

drivers/media/i2c/adv7180.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static int adv7180_probe(struct i2c_client *client, 
		goto err_unregister_vpp_client;



	state->pad.flags = MEDIA_PAD_FL_SOURCE;

	sd->entity.flags |= MEDIA_ENT_T_V4L2_SUBDEV_DECODER;

	sd->entity.flags |= MEDIA_ENT_F_ATV_DECODER;

	ret = media_entity_init(&sd->entity, 1, &state->pad);

	if (ret)

		goto err_free_ctrl;

drivers/media/i2c/as3645a.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static int as3645a_probe(struct i2c_client *client, 
	if (ret < 0)

		goto done;



	flash->subdev.entity.function = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;

	flash->subdev.entity.function = MEDIA_ENT_F_FLASH;



	mutex_init(&flash->power_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE