Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9727a954 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] media.h: get rid of MEDIA_ENT_F_CONN_TEST 



Defining it as a connector was a bad idea. Remove it while it is
not too late.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1f452240

Documentation/DocBook/media/v4l/media-types.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>

	    <entry>Camera video sensor entity.</entry>

drivers/media/usb/au0828/au0828-video.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1843,8 +1843,7 @@ static void au0828_analog_create_entities(struct au0828_dev *dev) 
			ent->function = MEDIA_ENT_F_CONN_RF;

			ent->function = MEDIA_ENT_F_CONN_RF;

			break;

			break;

		default: /* AU0828_VMUX_DEBUG */

		default: /* AU0828_VMUX_DEBUG */

			ent->function = MEDIA_ENT_F_CONN_TEST;

			continue;

			break;

		}

		}





		ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);

		ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);

include/uapi/linux/media.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,6 @@ struct media_device_info { 
#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 10001)

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 10001)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 10002)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 10002)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 10003)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 10003)

/* For internal test signal generators and other debug connectors */

#define MEDIA_ENT_F_CONN_TEST		(MEDIA_ENT_F_BASE + 10004)





/*

/*

 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and

 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and