On 08/30/2015 05:06 AM, Mauro Carvalho Chehab wrote: > Now that interfaces and entities are distinct, it makes no sense > of keeping something named as MEDIA_ENT_T_DEVNODE_DVB_foo. > > Made via this script: > for i in $(git grep -l MEDIA_ENT_T|grep -v uapi/linux/media.h); do sed s,MEDIA_ENT_T_DEVNODE_DVB_,MEDIA_ENT_T_DVB_, <$i >a && mv a $i; done > for i in $(git grep -l MEDIA_ENT_T|grep -v uapi/linux/media.h); do sed s,MEDIA_ENT_T_DVB_DVR,MEDIA_ENT_T_DVB_TSOUT, <$i >a && mv a $i; done > for i in $(git grep -l MEDIA_ENT_T|grep -v uapi/linux/media.h); do sed s,MEDIA_ENT_T_DVB_FE,MEDIA_ENT_T_DVB_DEMOD, <$i >a && mv a $i; done > for i in $(git grep -l MEDIA_ENT_T|grep -v uapi/linux/media.h); do sed s,MEDIA_ENT_T_DVB_NET,MEDIA_ENT_T_DVB_DEMOD_NET_DECAP, <$i >a && mv a $i; done > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> > > diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml > index 910243d4edb8..32a783635649 100644 > --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml > +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml > @@ -195,23 +195,23 @@ > <entry>ALSA card</entry> > </row> > <row> > - <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_FE</constant></entry> > + <entry><constant>MEDIA_ENT_T_DVB_DEMOD</constant></entry> > <entry>DVB frontend devnode</entry> > </row> > <row> > - <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DEMUX</constant></entry> > + <entry><constant>MEDIA_ENT_T_DVB_DEMUX</constant></entry> > <entry>DVB demux devnode</entry> > </row> > <row> > - <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DVR</constant></entry> > + <entry><constant>MEDIA_ENT_T_DVB_TSOUT</constant></entry> > <entry>DVB DVR devnode</entry> > </row> > <row> > - <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_CA</constant></entry> > + <entry><constant>MEDIA_ENT_T_DVB_CA</constant></entry> > <entry>DVB CAM devnode</entry> > </row> > <row> > - <entry><constant>MEDIA_ENT_T_DEVNODE_DVB_NET</constant></entry> > + <entry><constant>MEDIA_ENT_T_DVB_DEMOD_NET_DECAP</constant></entry> > <entry>DVB network devnode</entry> > </row> > <row> > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html