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

Commit 0ea6bc8d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8523): v4l2-dev: remove unused type and type2 field from video_device 



The type and type2 fields were unused and so could be removed.
Instead add a vfl_type field that contains the type of the video
device.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c52e4f58

drivers/media/common/saa7146_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev 


	DEB_EE(("dev:%p\n",dev));



	if( VFL_TYPE_GRABBER == (*vid)->type ) {

	if ((*vid)->vfl_type == VFL_TYPE_GRABBER) {

		vv->video_minor = -1;

	} else {

		vv->vbi_minor = -1;

drivers/media/radio/dsbr100.c

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = { 
/* V4L2 interface */

static struct video_device dsbr100_videodev_template = {

	.name		= "D-Link DSB-R 100",

	.type		= VID_TYPE_TUNER,

	.fops		= &usb_dsbr100_fops,

	.ioctl_ops 	= &usb_dsbr100_ioctl_ops,

	.release	= video_device_release,

drivers/media/radio/miropcm20-radio.c

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ static const struct file_operations pcm20_fops = { 


static struct video_device pcm20_radio = {

	.name		= "Miro PCM 20 radio",

	.type		= VID_TYPE_TUNER,

	.fops           = &pcm20_fops,

	.priv		= &pcm20_unit

};

drivers/media/radio/radio-aimslab.c

+0 −1
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ static const struct v4l2_ioctl_ops rtrack_ioctl_ops = { 


static struct video_device rtrack_radio = {

	.name		= "RadioTrack radio",

	.type		= VID_TYPE_TUNER,

	.fops           = &rtrack_fops,

	.ioctl_ops 	= &rtrack_ioctl_ops,

};

drivers/media/radio/radio-aztech.c

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ static const struct v4l2_ioctl_ops aztech_ioctl_ops = { 


static struct video_device aztech_radio = {

	.name		    = "Aztech radio",

	.type		    = VID_TYPE_TUNER,

	.fops               = &aztech_fops,

	.ioctl_ops 	    = &aztech_ioctl_ops,

};