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

Commit 360104e3 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 c43875f6

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

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

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

	  </row>

	  <row>

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

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

	  </row>

	  <row>

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

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

drivers/media/v4l2-core/v4l2-mc.c

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) 
			break;

		case MEDIA_ENT_F_CONN_SVIDEO:

		case MEDIA_ENT_F_CONN_COMPOSITE:

		case MEDIA_ENT_F_CONN_TEST:

			ret = media_create_pad_link(entity, 0, decoder,

						    DEMOD_PAD_IF_INPUT,

						    flags);

include/uapi/linux/media.h

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

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 22)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 23)

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

#define MEDIA_ENT_F_CONN_TEST		(MEDIA_ENT_F_BASE + 24)



/*

 * I/O entities