| Message ID | 1457126045-8108-1-git-send-email-shuahkh@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/04/2016 10:14 PM, Shuah Khan wrote: > Add missing prefixes for DVB, V4L, and ALSA interface types. > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Thanks! Hans > --- > > Changes since v1: > Addresses Hans's comments on v1 > > drivers/media/media-entity.c | 34 +++++++++++++++++----------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c > index bcd7464..e95070b 100644 > --- a/drivers/media/media-entity.c > +++ b/drivers/media/media-entity.c > @@ -46,41 +46,41 @@ static inline const char *intf_type(struct media_interface *intf) > { > switch (intf->type) { > case MEDIA_INTF_T_DVB_FE: > - return "frontend"; > + return "dvb-frontend"; > case MEDIA_INTF_T_DVB_DEMUX: > - return "demux"; > + return "dvb-demux"; > case MEDIA_INTF_T_DVB_DVR: > - return "DVR"; > + return "dvb-dvr"; > case MEDIA_INTF_T_DVB_CA: > - return "CA"; > + return "dvb-ca"; > case MEDIA_INTF_T_DVB_NET: > - return "dvbnet"; > + return "dvb-net"; > case MEDIA_INTF_T_V4L_VIDEO: > - return "video"; > + return "v4l-video"; > case MEDIA_INTF_T_V4L_VBI: > - return "vbi"; > + return "v4l-vbi"; > case MEDIA_INTF_T_V4L_RADIO: > - return "radio"; > + return "v4l-radio"; > case MEDIA_INTF_T_V4L_SUBDEV: > - return "v4l2-subdev"; > + return "v4l-subdev"; > case MEDIA_INTF_T_V4L_SWRADIO: > - return "swradio"; > + return "v4l-swradio"; > case MEDIA_INTF_T_ALSA_PCM_CAPTURE: > - return "pcm-capture"; > + return "alsa-pcm-capture"; > case MEDIA_INTF_T_ALSA_PCM_PLAYBACK: > - return "pcm-playback"; > + return "alsa-pcm-playback"; > case MEDIA_INTF_T_ALSA_CONTROL: > return "alsa-control"; > case MEDIA_INTF_T_ALSA_COMPRESS: > - return "compress"; > + return "alsa-compress"; > case MEDIA_INTF_T_ALSA_RAWMIDI: > - return "rawmidi"; > + return "alsa-rawmidi"; > case MEDIA_INTF_T_ALSA_HWDEP: > - return "hwdep"; > + return "alsa-hwdep"; > case MEDIA_INTF_T_ALSA_SEQUENCER: > - return "sequencer"; > + return "alsa-sequencer"; > case MEDIA_INTF_T_ALSA_TIMER: > - return "timer"; > + return "alsa-timer"; > default: > return "unknown-intf"; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index bcd7464..e95070b 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -46,41 +46,41 @@ static inline const char *intf_type(struct media_interface *intf) { switch (intf->type) { case MEDIA_INTF_T_DVB_FE: - return "frontend"; + return "dvb-frontend"; case MEDIA_INTF_T_DVB_DEMUX: - return "demux"; + return "dvb-demux"; case MEDIA_INTF_T_DVB_DVR: - return "DVR"; + return "dvb-dvr"; case MEDIA_INTF_T_DVB_CA: - return "CA"; + return "dvb-ca"; case MEDIA_INTF_T_DVB_NET: - return "dvbnet"; + return "dvb-net"; case MEDIA_INTF_T_V4L_VIDEO: - return "video"; + return "v4l-video"; case MEDIA_INTF_T_V4L_VBI: - return "vbi"; + return "v4l-vbi"; case MEDIA_INTF_T_V4L_RADIO: - return "radio"; + return "v4l-radio"; case MEDIA_INTF_T_V4L_SUBDEV: - return "v4l2-subdev"; + return "v4l-subdev"; case MEDIA_INTF_T_V4L_SWRADIO: - return "swradio"; + return "v4l-swradio"; case MEDIA_INTF_T_ALSA_PCM_CAPTURE: - return "pcm-capture"; + return "alsa-pcm-capture"; case MEDIA_INTF_T_ALSA_PCM_PLAYBACK: - return "pcm-playback"; + return "alsa-pcm-playback"; case MEDIA_INTF_T_ALSA_CONTROL: return "alsa-control"; case MEDIA_INTF_T_ALSA_COMPRESS: - return "compress"; + return "alsa-compress"; case MEDIA_INTF_T_ALSA_RAWMIDI: - return "rawmidi"; + return "alsa-rawmidi"; case MEDIA_INTF_T_ALSA_HWDEP: - return "hwdep"; + return "alsa-hwdep"; case MEDIA_INTF_T_ALSA_SEQUENCER: - return "sequencer"; + return "alsa-sequencer"; case MEDIA_INTF_T_ALSA_TIMER: - return "timer"; + return "alsa-timer"; default: return "unknown-intf"; }
Add missing prefixes for DVB, V4L, and ALSA interface types. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- Changes since v1: Addresses Hans's comments on v1 drivers/media/media-entity.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)