forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2008-07-26 08:26:43 -03:00 • committed by Mauro Carvalho Chehab
commit 0ea6bc8d43
64 changed files with 14 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/common/saa7146_fops.c
View file

@ -563,7 +563,7 @@ int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev
DEB_EE(("dev:%p\n",dev)); DEB_EE(("dev:%p\n",dev));
if( VFL_TYPE_GRABBER == (*vid)->type ) { if ((*vid)->vfl_type == VFL_TYPE_GRABBER) {
vv->video_minor = -1; vv->video_minor = -1;
} else { } else {
vv->vbi_minor = -1; vv->vbi_minor = -1;

1
drivers/media/radio/dsbr100.c
View file

@ -463,7 +463,6 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
/* V4L2 interface */ /* V4L2 interface */
static struct video_device dsbr100_videodev_template = { static struct video_device dsbr100_videodev_template = {
.name = "D-Link DSB-R 100", .name = "D-Link DSB-R 100",
.type = VID_TYPE_TUNER,
.fops = &usb_dsbr100_fops, .fops = &usb_dsbr100_fops,
.ioctl_ops = &usb_dsbr100_ioctl_ops, .ioctl_ops = &usb_dsbr100_ioctl_ops,
.release = video_device_release, .release = video_device_release,

1
drivers/media/radio/miropcm20-radio.c
View file

@ -230,7 +230,6 @@ static const struct file_operations pcm20_fops = {
static struct video_device pcm20_radio = { static struct video_device pcm20_radio = {
.name = "Miro PCM 20 radio", .name = "Miro PCM 20 radio",
.type = VID_TYPE_TUNER,
.fops = &pcm20_fops, .fops = &pcm20_fops,
.priv = &pcm20_unit .priv = &pcm20_unit
}; };

1
drivers/media/radio/radio-aimslab.c
View file

@ -406,7 +406,6 @@ static const struct v4l2_ioctl_ops rtrack_ioctl_ops = {
static struct video_device rtrack_radio = { static struct video_device rtrack_radio = {
.name = "RadioTrack radio", .name = "RadioTrack radio",
.type = VID_TYPE_TUNER,
.fops = &rtrack_fops, .fops = &rtrack_fops,
.ioctl_ops = &rtrack_ioctl_ops, .ioctl_ops = &rtrack_ioctl_ops,
}; };

1
drivers/media/radio/radio-aztech.c
View file

@ -370,7 +370,6 @@ static const struct v4l2_ioctl_ops aztech_ioctl_ops = {
static struct video_device aztech_radio = { static struct video_device aztech_radio = {
.name = "Aztech radio", .name = "Aztech radio",
.type = VID_TYPE_TUNER,
.fops = &aztech_fops, .fops = &aztech_fops,
.ioctl_ops = &aztech_ioctl_ops, .ioctl_ops = &aztech_ioctl_ops,
}; };

1
drivers/media/radio/radio-cadet.c
View file

@ -587,7 +587,6 @@ static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
static struct video_device cadet_radio = { static struct video_device cadet_radio = {
.name = "Cadet radio", .name = "Cadet radio",
.type = VID_TYPE_TUNER,
.fops = &cadet_fops, .fops = &cadet_fops,
.ioctl_ops = &cadet_ioctl_ops, .ioctl_ops = &cadet_ioctl_ops,
}; };

1
drivers/media/radio/radio-gemtek-pci.c
View file

@ -392,7 +392,6 @@ static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
static struct video_device vdev_template = { static struct video_device vdev_template = {
.name = "Gemtek PCI Radio", .name = "Gemtek PCI Radio",
.type = VID_TYPE_TUNER,
.fops = &gemtek_pci_fops, .fops = &gemtek_pci_fops,
.ioctl_ops = &gemtek_pci_ioctl_ops, .ioctl_ops = &gemtek_pci_ioctl_ops,
}; };

1
drivers/media/radio/radio-gemtek.c
View file

@ -570,7 +570,6 @@ static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {
static struct video_device gemtek_radio = { static struct video_device gemtek_radio = {
.name = "GemTek Radio card", .name = "GemTek Radio card",
.type = VID_TYPE_TUNER,
.fops = &gemtek_fops, .fops = &gemtek_fops,
.ioctl_ops = &gemtek_ioctl_ops, .ioctl_ops = &gemtek_ioctl_ops,
}; };

1
drivers/media/radio/radio-maestro.c
View file

@ -372,7 +372,6 @@ static const struct v4l2_ioctl_ops maestro_ioctl_ops = {
static struct video_device maestro_radio = { static struct video_device maestro_radio = {
.name = "Maestro radio", .name = "Maestro radio",
.type = VID_TYPE_TUNER,
.fops = &maestro_fops, .fops = &maestro_fops,
.ioctl_ops = &maestro_ioctl_ops, .ioctl_ops = &maestro_ioctl_ops,
}; };

1
drivers/media/radio/radio-maxiradio.c
View file

@ -391,7 +391,6 @@ static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {
static struct video_device maxiradio_radio = { static struct video_device maxiradio_radio = {
.name = "Maxi Radio FM2000 radio", .name = "Maxi Radio FM2000 radio",
.type = VID_TYPE_TUNER,
.fops = &maxiradio_fops, .fops = &maxiradio_fops,
.ioctl_ops = &maxiradio_ioctl_ops, .ioctl_ops = &maxiradio_ioctl_ops,
}; };

1
drivers/media/radio/radio-rtrack2.c
View file

@ -312,7 +312,6 @@ static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = {
static struct video_device rtrack2_radio = { static struct video_device rtrack2_radio = {
.name = "RadioTrack II radio", .name = "RadioTrack II radio",
.type = VID_TYPE_TUNER,
.fops = &rtrack2_fops, .fops = &rtrack2_fops,
.ioctl_ops = &rtrack2_ioctl_ops, .ioctl_ops = &rtrack2_ioctl_ops,
}; };

1
drivers/media/radio/radio-sf16fmi.c
View file

@ -312,7 +312,6 @@ static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
static struct video_device fmi_radio = { static struct video_device fmi_radio = {
.name = "SF16FMx radio", .name = "SF16FMx radio",
.type = VID_TYPE_TUNER,
.fops = &fmi_fops, .fops = &fmi_fops,
.ioctl_ops = &fmi_ioctl_ops, .ioctl_ops = &fmi_ioctl_ops,
}; };

1
drivers/media/radio/radio-sf16fmr2.c
View file

@ -428,7 +428,6 @@ static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
static struct video_device fmr2_radio = { static struct video_device fmr2_radio = {
.name = "SF16FMR2 radio", .name = "SF16FMR2 radio",
.type = VID_TYPE_TUNER,
.fops = &fmr2_fops, .fops = &fmr2_fops,
.ioctl_ops = &fmr2_ioctl_ops, .ioctl_ops = &fmr2_ioctl_ops,
}; };

1
drivers/media/radio/radio-si470x.c
View file

@ -1609,7 +1609,6 @@ static struct video_device si470x_viddev_template = {
.fops = &si470x_fops, .fops = &si470x_fops,
.ioctl_ops = &si470x_ioctl_ops, .ioctl_ops = &si470x_ioctl_ops,
.name = DRIVER_NAME, .name = DRIVER_NAME,
.type = VID_TYPE_TUNER,
.release = video_device_release, .release = video_device_release,
}; };

1
drivers/media/radio/radio-terratec.c
View file

@ -384,7 +384,6 @@ static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
static struct video_device terratec_radio = { static struct video_device terratec_radio = {
.name = "TerraTec ActiveRadio", .name = "TerraTec ActiveRadio",
.type = VID_TYPE_TUNER,
.fops = &terratec_fops, .fops = &terratec_fops,
.ioctl_ops = &terratec_ioctl_ops, .ioctl_ops = &terratec_ioctl_ops,
}; };

1
drivers/media/radio/radio-trust.c
View file

@ -364,7 +364,6 @@ static const struct v4l2_ioctl_ops trust_ioctl_ops = {
static struct video_device trust_radio = { static struct video_device trust_radio = {
.name = "Trust FM Radio", .name = "Trust FM Radio",
.type = VID_TYPE_TUNER,
.fops = &trust_fops, .fops = &trust_fops,
.ioctl_ops = &trust_ioctl_ops, .ioctl_ops = &trust_ioctl_ops,
}; };

1
drivers/media/radio/radio-typhoon.c
View file

@ -362,7 +362,6 @@ static const struct v4l2_ioctl_ops typhoon_ioctl_ops = {
static struct video_device typhoon_radio = { static struct video_device typhoon_radio = {
.name = "Typhoon Radio", .name = "Typhoon Radio",
.type = VID_TYPE_TUNER,
.fops = &typhoon_fops, .fops = &typhoon_fops,
.ioctl_ops = &typhoon_ioctl_ops, .ioctl_ops = &typhoon_ioctl_ops,
}; };

1
drivers/media/radio/radio-zoltrix.c
View file

@ -425,7 +425,6 @@ static const struct v4l2_ioctl_ops zoltrix_ioctl_ops = {
static struct video_device zoltrix_radio = { static struct video_device zoltrix_radio = {
.name = "Zoltrix Radio Plus", .name = "Zoltrix Radio Plus",
.type = VID_TYPE_TUNER,
.fops = &zoltrix_fops, .fops = &zoltrix_fops,
.ioctl_ops = &zoltrix_ioctl_ops, .ioctl_ops = &zoltrix_ioctl_ops,
}; };

23
drivers/media/video/bt8xx/bttv-driver.c
View file

@ -4182,8 +4182,7 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
static struct video_device *vdev_init(struct bttv *btv, static struct video_device *vdev_init(struct bttv *btv,
const struct video_device *template, const struct video_device *template,
const char *type_name, const char *type_name)
const int type)
{ {
struct video_device *vfd; struct video_device *vfd;
@ -4194,7 +4193,6 @@ static struct video_device *vdev_init(struct bttv *btv,
vfd->minor = -1; vfd->minor = -1;
vfd->parent = &btv->c.pci->dev; vfd->parent = &btv->c.pci->dev;
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->type = type;
vfd->debug = bttv_debug; vfd->debug = bttv_debug;
snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)", snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "", btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "",
@ -4230,20 +4228,11 @@ static void bttv_unregister_video(struct bttv *btv)
/* register video4linux devices */ /* register video4linux devices */
static int __devinit bttv_register_video(struct bttv *btv) static int __devinit bttv_register_video(struct bttv *btv)
{ {
int video_type = VID_TYPE_CAPTURE | if (no_overlay > 0)
VID_TYPE_TUNER |
VID_TYPE_CLIPPING|
VID_TYPE_SCALES;
if (no_overlay <= 0) {
bttv_video_template.type |= VID_TYPE_OVERLAY;
} else {
printk("bttv: Overlay support disabled.\n"); printk("bttv: Overlay support disabled.\n");
}
/* video */ /* video */
btv->video_dev = vdev_init(btv, &bttv_video_template, btv->video_dev = vdev_init(btv, &bttv_video_template, "video");
"video", video_type);
if (NULL == btv->video_dev) if (NULL == btv->video_dev)
goto err; goto err;
@ -4259,8 +4248,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
} }
/* vbi */ /* vbi */
btv->vbi_dev = vdev_init(btv, &bttv_video_template, btv->vbi_dev = vdev_init(btv, &bttv_video_template, "vbi");
"vbi", VID_TYPE_TUNER | VID_TYPE_TELETEXT);
if (NULL == btv->vbi_dev) if (NULL == btv->vbi_dev)
goto err; goto err;
@ -4272,8 +4260,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
if (!btv->has_radio) if (!btv->has_radio)
return 0; return 0;
/* radio */ /* radio */
btv->radio_dev = vdev_init(btv, &radio_template, btv->radio_dev = vdev_init(btv, &radio_template, "radio");
"radio", VID_TYPE_TUNER);
if (NULL == btv->radio_dev) if (NULL == btv->radio_dev)
goto err; goto err;
if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0) if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0)

1
drivers/media/video/bw-qcam.c
View file

@ -908,7 +908,6 @@ static const struct file_operations qcam_fops = {
static struct video_device qcam_template= static struct video_device qcam_template=
{ {
.name = "Connectix Quickcam", .name = "Connectix Quickcam",
.type = VID_TYPE_CAPTURE,
.fops = &qcam_fops, .fops = &qcam_fops,
}; };

1
drivers/media/video/c-qcam.c
View file

@ -703,7 +703,6 @@ static const struct file_operations qcam_fops = {
static struct video_device qcam_template= static struct video_device qcam_template=
{ {
.name = "Colour QuickCam", .name = "Colour QuickCam",
.type = VID_TYPE_CAPTURE,
.fops = &qcam_fops, .fops = &qcam_fops,
}; };

2
drivers/media/video/cafe_ccic.c
View file

@ -1794,8 +1794,6 @@ static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {
static struct video_device cafe_v4l_template = { static struct video_device cafe_v4l_template = {
.name = "cafe", .name = "cafe",
.type = VFL_TYPE_GRABBER,
.type2 = VID_TYPE_CAPTURE,
.minor = -1, /* Get one dynamically */ .minor = -1, /* Get one dynamically */
.tvnorms = V4L2_STD_NTSC_M, .tvnorms = V4L2_STD_NTSC_M,
.current_norm = V4L2_STD_NTSC_M, /* make mplayer happy */ .current_norm = V4L2_STD_NTSC_M, /* make mplayer happy */

1
drivers/media/video/cpia.c
View file

@ -3800,7 +3800,6 @@ static const struct file_operations cpia_fops = {
static struct video_device cpia_template = { static struct video_device cpia_template = {
.name = "CPiA Camera", .name = "CPiA Camera",
.type = VID_TYPE_CAPTURE,
.fops = &cpia_fops, .fops = &cpia_fops,
}; };

3
drivers/media/video/cpia2/cpia2_v4l.c
View file

@ -1937,9 +1937,6 @@ static const struct file_operations fops_template = {
static struct video_device cpia2_template = { static struct video_device cpia2_template = {
/* I could not find any place for the old .initialize initializer?? */ /* I could not find any place for the old .initialize initializer?? */
.name= "CPiA2 Camera", .name= "CPiA2 Camera",
.type= VID_TYPE_CAPTURE,
.type2 = V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_STREAMING,
.minor= -1, .minor= -1,
.fops= &fops_template, .fops= &fops_template,
.release= video_device_release, .release= video_device_release,

3
drivers/media/video/cx18/cx18-streams.c
View file

@ -187,9 +187,6 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
return -ENOMEM; return -ENOMEM;
} }
s->v4l2dev->type =
VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT |
VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER;
snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d", snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d",
cx->num); cx->num);

4
drivers/media/video/cx23885/cx23885-417.c
View file

@ -1731,10 +1731,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
static struct video_device cx23885_mpeg_template = { static struct video_device cx23885_mpeg_template = {
.name = "cx23885", .name = "cx23885",
.type = VID_TYPE_CAPTURE |
VID_TYPE_TUNER |
VID_TYPE_SCALES |
VID_TYPE_MPEG_ENCODER,
.fops = &mpeg_fops, .fops = &mpeg_fops,
.ioctl_ops = &mpeg_ioctl_ops, .ioctl_ops = &mpeg_ioctl_ops,
.minor = -1, .minor = -1,

2
drivers/media/video/cx23885/cx23885-video.c
View file

@ -1472,7 +1472,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
static struct video_device cx23885_vbi_template; static struct video_device cx23885_vbi_template;
static struct video_device cx23885_video_template = { static struct video_device cx23885_video_template = {
.name = "cx23885-video", .name = "cx23885-video",
.type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
.fops = &video_fops, .fops = &video_fops,
.minor = -1, .minor = -1,
.ioctl_ops = &video_ioctl_ops, .ioctl_ops = &video_ioctl_ops,
@ -1517,7 +1516,6 @@ int cx23885_video_register(struct cx23885_dev *dev)
memcpy(&cx23885_vbi_template, &cx23885_video_template, memcpy(&cx23885_vbi_template, &cx23885_video_template,
sizeof(cx23885_vbi_template)); sizeof(cx23885_vbi_template));
strcpy(cx23885_vbi_template.name, "cx23885-vbi"); strcpy(cx23885_vbi_template.name, "cx23885-vbi");
cx23885_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
dev->tvnorm = cx23885_video_template.current_norm; dev->tvnorm = cx23885_video_template.current_norm;

2
drivers/media/video/cx88/cx88-blackbird.c
View file

@ -1207,8 +1207,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
static struct video_device cx8802_mpeg_template = { static struct video_device cx8802_mpeg_template = {
.name = "cx8802", .name = "cx8802",
.type = VID_TYPE_CAPTURE | VID_TYPE_TUNER |
VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER,
.fops = &mpeg_fops, .fops = &mpeg_fops,
.ioctl_ops = &mpeg_ioctl_ops, .ioctl_ops = &mpeg_ioctl_ops,
.minor = -1, .minor = -1,

3
drivers/media/video/cx88/cx88-video.c
View file

@ -1722,7 +1722,6 @@ static struct video_device cx8800_vbi_template;
static struct video_device cx8800_video_template = { static struct video_device cx8800_video_template = {
.name = "cx8800-video", .name = "cx8800-video",
.type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
.fops = &video_fops, .fops = &video_fops,
.minor = -1, .minor = -1,
.ioctl_ops = &video_ioctl_ops, .ioctl_ops = &video_ioctl_ops,
@ -1761,7 +1760,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
static struct video_device cx8800_radio_template = { static struct video_device cx8800_radio_template = {
.name = "cx8800-radio", .name = "cx8800-radio",
.type = VID_TYPE_TUNER,
.fops = &radio_fops, .fops = &radio_fops,
.minor = -1, .minor = -1,
.ioctl_ops = &radio_ioctl_ops, .ioctl_ops = &radio_ioctl_ops,
@ -1838,7 +1836,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
memcpy( &cx8800_vbi_template, &cx8800_video_template, memcpy( &cx8800_vbi_template, &cx8800_video_template,
sizeof(cx8800_vbi_template) ); sizeof(cx8800_vbi_template) );
strcpy(cx8800_vbi_template.name,"cx8800-vbi"); strcpy(cx8800_vbi_template.name,"cx8800-vbi");
cx8800_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
/* initialize driver struct */ /* initialize driver struct */
spin_lock_init(&dev->slock); spin_lock_init(&dev->slock);

14
drivers/media/video/em28xx/em28xx-video.c
View file

@ -1845,7 +1845,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
static struct video_device em28xx_radio_template = { static struct video_device em28xx_radio_template = {
.name = "em28xx-radio", .name = "em28xx-radio",
.type = VID_TYPE_TUNER,
.fops = &radio_fops, .fops = &radio_fops,
.ioctl_ops = &radio_ioctl_ops, .ioctl_ops = &radio_ioctl_ops,
.minor = -1, .minor = -1,
@ -1891,7 +1890,6 @@ EXPORT_SYMBOL(em28xx_unregister_extension);
static struct video_device *em28xx_vdev_init(struct em28xx *dev, static struct video_device *em28xx_vdev_init(struct em28xx *dev,
const struct video_device *template, const struct video_device *template,
const int type,
const char *type_name) const char *type_name)
{ {
struct video_device *vfd; struct video_device *vfd;
@ -1903,7 +1901,6 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
vfd->minor = -1; vfd->minor = -1;
vfd->parent = &dev->udev->dev; vfd->parent = &dev->udev->dev;
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->type = type;
vfd->debug = video_debug; vfd->debug = video_debug;
snprintf(vfd->name, sizeof(vfd->name), "%s %s", snprintf(vfd->name, sizeof(vfd->name), "%s %s",
@ -1981,14 +1978,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
list_add_tail(&dev->devlist, &em28xx_devlist); list_add_tail(&dev->devlist, &em28xx_devlist);
/* allocate and fill video video_device struct */ /* allocate and fill video video_device struct */
dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
VID_TYPE_CAPTURE, "video");
if (NULL == dev->vdev) { if (NULL == dev->vdev) {
em28xx_errdev("cannot allocate video_device.\n"); em28xx_errdev("cannot allocate video_device.\n");
goto fail_unreg; goto fail_unreg;
} }
if (dev->tuner_type != TUNER_ABSENT)
dev->vdev->type |= VID_TYPE_TUNER;
/* register v4l2 video video_device */ /* register v4l2 video video_device */
retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER, retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
@ -2000,8 +1994,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
} }
/* Allocate and fill vbi video_device struct */ /* Allocate and fill vbi video_device struct */
dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
VFL_TYPE_VBI, "vbi");
/* register v4l2 vbi video_device */ /* register v4l2 vbi video_device */
if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI, if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
vbi_nr[dev->devno]) < 0) { vbi_nr[dev->devno]) < 0) {
@ -2011,8 +2004,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
} }
if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
VFL_TYPE_RADIO, "radio");
if (NULL == dev->radio_dev) { if (NULL == dev->radio_dev) {
em28xx_errdev("cannot allocate video_device.\n"); em28xx_errdev("cannot allocate video_device.\n");
goto fail_unreg; goto fail_unreg;

1
drivers/media/video/et61x251/et61x251_core.c
View file

@ -2585,7 +2585,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
} }
strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera");
cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
cam->v4ldev->fops = &et61x251_fops; cam->v4ldev->fops = &et61x251_fops;
cam->v4ldev->minor = video_nr[dev_nr]; cam->v4ldev->minor = video_nr[dev_nr];
cam->v4ldev->release = video_device_release; cam->v4ldev->release = video_device_release;

1
drivers/media/video/gspca/gspca.c
View file

@ -1691,7 +1691,6 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
static struct video_device gspca_template = { static struct video_device gspca_template = {
.name = "gspca main driver", .name = "gspca main driver",
.type = VID_TYPE_CAPTURE,
.fops = &dev_fops, .fops = &dev_fops,
.ioctl_ops = &dev_ioctl_ops, .ioctl_ops = &dev_ioctl_ops,
.release = dev_release, /* mandatory */ .release = dev_release, /* mandatory */

5
drivers/media/video/ivtv/ivtv-streams.c
View file

@ -208,11 +208,6 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
return -ENOMEM; return -ENOMEM;
} }
s->v4l2dev->type = VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT |
VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER;
if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
s->v4l2dev->type |= VID_TYPE_MPEG_DECODER;
}
snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s", snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
itv->num, s->name); itv->num, s->name);

1
drivers/media/video/meye.c
View file

@ -1721,7 +1721,6 @@ static const struct v4l2_ioctl_ops meye_ioctl_ops = {
static struct video_device meye_template = { static struct video_device meye_template = {
.name = "meye", .name = "meye",
.type = VID_TYPE_CAPTURE,
.fops = &meye_fops, .fops = &meye_fops,
.ioctl_ops = &meye_ioctl_ops, .ioctl_ops = &meye_ioctl_ops,
.release = video_device_release, .release = video_device_release,

1
drivers/media/video/ov511.c
View file

@ -4667,7 +4667,6 @@ static const struct file_operations ov511_fops = {
static struct video_device vdev_template = { static struct video_device vdev_template = {
.name = "OV511 USB Camera", .name = "OV511 USB Camera",
.type = VID_TYPE_CAPTURE,
.fops = &ov511_fops, .fops = &ov511_fops,
.release = video_device_release, .release = video_device_release,
.minor = -1, .minor = -1,

1
drivers/media/video/pms.c
View file

@ -896,7 +896,6 @@ static const struct file_operations pms_fops = {
static struct video_device pms_template= static struct video_device pms_template=
{ {
.name = "Mediavision PMS", .name = "Mediavision PMS",
.type = VID_TYPE_CAPTURE,
.fops = &pms_fops, .fops = &pms_fops,
}; };

4
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
View file

@ -1161,10 +1161,6 @@ static const struct file_operations vdev_fops = {
static struct video_device vdev_template = { static struct video_device vdev_template = {
.type = VID_TYPE_CAPTURE | VID_TYPE_TUNER,
.type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE
| V4L2_CAP_TUNER | V4L2_CAP_AUDIO
| V4L2_CAP_READWRITE),
.fops = &vdev_fops, .fops = &vdev_fops,
}; };

1
drivers/media/video/pwc/pwc-if.c
View file

@ -166,7 +166,6 @@ static const struct file_operations pwc_fops = {
}; };
static struct video_device pwc_template = { static struct video_device pwc_template = {
.name = "Philips Webcam", /* Filled in later */ .name = "Philips Webcam", /* Filled in later */
.type = VID_TYPE_CAPTURE,
.release = video_device_release, .release = video_device_release,
.fops = &pwc_fops, .fops = &pwc_fops,
.minor = -1, .minor = -1,

1
drivers/media/video/s2255drv.c
View file

@ -1705,7 +1705,6 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = {
static struct video_device template = { static struct video_device template = {
.name = "s2255v", .name = "s2255v",
.type = VID_TYPE_CAPTURE,
.fops = &s2255_fops_v4l, .fops = &s2255_fops_v4l,
.ioctl_ops = &s2255_ioctl_ops, .ioctl_ops = &s2255_ioctl_ops,
.minor = -1, .minor = -1,

1
drivers/media/video/saa5246a.c
View file

@ -831,7 +831,6 @@ static const struct file_operations saa_fops = {
static struct video_device saa_template = static struct video_device saa_template =
{ {
.name = IF_NAME, .name = IF_NAME,
.type = VID_TYPE_TELETEXT,
.fops = &saa_fops, .fops = &saa_fops,
.release = video_device_release, .release = video_device_release,
.minor = -1, .minor = -1,

1
drivers/media/video/saa5249.c
View file

@ -712,7 +712,6 @@ static const struct file_operations saa_fops = {
static struct video_device saa_template = static struct video_device saa_template =
{ {
.name = IF_NAME, .name = IF_NAME,
.type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */
.fops = &saa_fops, .fops = &saa_fops,
}; };

9
drivers/media/video/saa7134/saa7134-core.c
View file

@ -1008,11 +1008,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
v4l2_prio_init(&dev->prio); v4l2_prio_init(&dev->prio);
/* register v4l devices */ /* register v4l devices */
if (saa7134_no_overlay <= 0) { if (saa7134_no_overlay > 0)
saa7134_video_template.type |= VID_TYPE_OVERLAY; printk(KERN_INFO "%s: Overlay support disabled.\n", dev->name);
} else {
printk("%s: Overlay support disabled.\n",dev->name);
}
dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");
err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
video_nr[dev->nr]); video_nr[dev->nr]);
@ -1025,7 +1023,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
dev->name,dev->video_dev->minor & 0x1f); dev->name,dev->video_dev->minor & 0x1f);
dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi");
dev->vbi_dev->type = VID_TYPE_TUNER | VID_TYPE_TELETEXT;
err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
vbi_nr[dev->nr]); vbi_nr[dev->nr]);

2
drivers/media/video/saa7134/saa7134-empress.c
View file

@ -439,8 +439,6 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {
static struct video_device saa7134_empress_template = { static struct video_device saa7134_empress_template = {
.name = "saa7134-empress", .name = "saa7134-empress",
.type = 0 /* FIXME */,
.type2 = 0 /* FIXME */,
.fops = &ts_fops, .fops = &ts_fops,
.minor = -1, .minor = -1,
.ioctl_ops = &ts_ioctl_ops, .ioctl_ops = &ts_ioctl_ops,

3
drivers/media/video/saa7134/saa7134-video.c
View file

@ -2451,8 +2451,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
struct video_device saa7134_video_template = { struct video_device saa7134_video_template = {
.name = "saa7134-video", .name = "saa7134-video",
.type = VID_TYPE_CAPTURE|VID_TYPE_TUNER |
VID_TYPE_CLIPPING|VID_TYPE_SCALES,
.fops = &video_fops, .fops = &video_fops,
.ioctl_ops = &video_ioctl_ops, .ioctl_ops = &video_ioctl_ops,
.minor = -1, .minor = -1,
@ -2462,7 +2460,6 @@ struct video_device saa7134_video_template = {
struct video_device saa7134_radio_template = { struct video_device saa7134_radio_template = {
.name = "saa7134-radio", .name = "saa7134-radio",
.type = VID_TYPE_TUNER,
.fops = &radio_fops, .fops = &radio_fops,
.ioctl_ops = &radio_ioctl_ops, .ioctl_ops = &radio_ioctl_ops,
.minor = -1, .minor = -1,

1
drivers/media/video/se401.c
View file

@ -1231,7 +1231,6 @@ static const struct file_operations se401_fops = {
}; };
static struct video_device se401_template = { static struct video_device se401_template = {
.name = "se401 USB camera", .name = "se401 USB camera",
.type = VID_TYPE_CAPTURE,
.fops = &se401_fops, .fops = &se401_fops,
}; };

1
drivers/media/video/sn9c102/sn9c102_core.c
View file

@ -3309,7 +3309,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
} }
strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
cam->v4ldev->fops = &sn9c102_fops; cam->v4ldev->fops = &sn9c102_fops;
cam->v4ldev->minor = video_nr[dev_nr]; cam->v4ldev->minor = video_nr[dev_nr];
cam->v4ldev->release = video_device_release; cam->v4ldev->release = video_device_release;

1
drivers/media/video/soc_camera.c
View file

@ -908,7 +908,6 @@ int soc_camera_video_start(struct soc_camera_device *icd)
strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name)); strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name));
/* Maybe better &ici->dev */ /* Maybe better &ici->dev */
vdev->parent = &icd->dev; vdev->parent = &icd->dev;
vdev->type = VID_TYPE_CAPTURE;
vdev->current_norm = V4L2_STD_UNKNOWN; vdev->current_norm = V4L2_STD_UNKNOWN;
vdev->fops = &soc_camera_fops; vdev->fops = &soc_camera_fops;
vdev->ioctl_ops = &soc_camera_ioctl_ops; vdev->ioctl_ops = &soc_camera_ioctl_ops;

2
drivers/media/video/stk-webcam.c
View file

@ -1359,8 +1359,6 @@ static void stk_v4l_dev_release(struct video_device *vd)
static struct video_device stk_v4l_data = { static struct video_device stk_v4l_data = {
.name = "stkwebcam", .name = "stkwebcam",
.type = VFL_TYPE_GRABBER,
.type2 = VID_TYPE_CAPTURE,
.minor = -1, .minor = -1,
.tvnorms = V4L2_STD_UNKNOWN, .tvnorms = V4L2_STD_UNKNOWN,
.current_norm = V4L2_STD_UNKNOWN, .current_norm = V4L2_STD_UNKNOWN,

1
drivers/media/video/stradis.c
View file

@ -1919,7 +1919,6 @@ static const struct file_operations saa_fops = {
/* template for video_device-structure */ /* template for video_device-structure */
static struct video_device saa_template = { static struct video_device saa_template = {
.name = "SAA7146A", .name = "SAA7146A",
.type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
.fops = &saa_fops, .fops = &saa_fops,
.minor = -1, .minor = -1,
}; };

1
drivers/media/video/stv680.c
View file

@ -1403,7 +1403,6 @@ static const struct file_operations stv680_fops = {
}; };
static struct video_device stv680_template = { static struct video_device stv680_template = {
.name = "STV0680 USB camera", .name = "STV0680 USB camera",
.type = VID_TYPE_CAPTURE,
.fops = &stv680_fops, .fops = &stv680_fops,
.release = video_device_release, .release = video_device_release,
.minor = -1, .minor = -1,

1
drivers/media/video/usbvideo/usbvideo.c
View file

@ -952,7 +952,6 @@ static const struct file_operations usbvideo_fops = {
.llseek = no_llseek, .llseek = no_llseek,
}; };
static const struct video_device usbvideo_template = { static const struct video_device usbvideo_template = {
.type = VID_TYPE_CAPTURE,
.fops = &usbvideo_fops, .fops = &usbvideo_fops,
}; };

1
drivers/media/video/usbvideo/vicam.c
View file

@ -793,7 +793,6 @@ static const struct file_operations vicam_fops = {
static struct video_device vicam_template = { static struct video_device vicam_template = {
.name = "ViCam-based USB Camera", .name = "ViCam-based USB Camera",
.type = VID_TYPE_CAPTURE,
.fops = &vicam_fops, .fops = &vicam_fops,
.minor = -1, .minor = -1,
}; };

3
drivers/media/video/usbvision/usbvision-video.c
View file

@ -1405,7 +1405,6 @@ static const struct v4l2_ioctl_ops usbvision_ioctl_ops = {
}; };
static struct video_device usbvision_video_template = { static struct video_device usbvision_video_template = {
.type = VID_TYPE_TUNER | VID_TYPE_CAPTURE,
.fops = &usbvision_fops, .fops = &usbvision_fops,
.ioctl_ops = &usbvision_ioctl_ops, .ioctl_ops = &usbvision_ioctl_ops,
.name = "usbvision-video", .name = "usbvision-video",
@ -1443,7 +1442,6 @@ static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = {
}; };
static struct video_device usbvision_radio_template = { static struct video_device usbvision_radio_template = {
.type = VID_TYPE_TUNER,
.fops = &usbvision_radio_fops, .fops = &usbvision_radio_fops,
.name = "usbvision-radio", .name = "usbvision-radio",
.release = video_device_release, .release = video_device_release,
@ -1466,7 +1464,6 @@ static const struct file_operations usbvision_vbi_fops = {
static struct video_device usbvision_vbi_template= static struct video_device usbvision_vbi_template=
{ {
.type = VID_TYPE_TUNER,
.fops = &usbvision_vbi_fops, .fops = &usbvision_vbi_fops,
.release = video_device_release, .release = video_device_release,
.name = "usbvision-vbi", .name = "usbvision-vbi",

2
drivers/media/video/uvc/uvc_driver.c
View file

@ -1459,8 +1459,6 @@ static int uvc_register_video(struct uvc_device *dev)
* get another one. * get another one.
*/ */
vdev->parent = &dev->intf->dev; vdev->parent = &dev->intf->dev;
vdev->type = 0;
vdev->type2 = 0;
vdev->minor = -1; vdev->minor = -1;
vdev->fops = &uvc_fops; vdev->fops = &uvc_fops;
vdev->release = video_device_release; vdev->release = video_device_release;

1
drivers/media/video/v4l2-dev.c
View file

@ -302,6 +302,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
} }
} }
video_device[i] = vfd; video_device[i] = vfd;
vfd->vfl_type = type;
vfd->minor = i; vfd->minor = i;
ret = get_index(vfd, index); ret = get_index(vfd, index);

2
drivers/media/video/vino.c
View file

@ -4385,8 +4385,6 @@ static const struct file_operations vino_fops = {
static struct video_device v4l_device_template = { static struct video_device v4l_device_template = {
.name = "NOT SET", .name = "NOT SET",
/*.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | */
/* VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY */
.fops = &vino_fops, .fops = &vino_fops,
.minor = -1, .minor = -1,
}; };

1
drivers/media/video/vivi.c
View file

@ -1092,7 +1092,6 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = {
static struct video_device vivi_template = { static struct video_device vivi_template = {
.name = "vivi", .name = "vivi",
.type = VID_TYPE_CAPTURE,
.fops = &vivi_fops, .fops = &vivi_fops,
.ioctl_ops = &vivi_ioctl_ops, .ioctl_ops = &vivi_ioctl_ops,
.minor = -1, .minor = -1,

1
drivers/media/video/w9966.c
View file

@ -197,7 +197,6 @@ static const struct file_operations w9966_fops = {
}; };
static struct video_device w9966_template = { static struct video_device w9966_template = {
.name = W9966_DRIVERNAME, .name = W9966_DRIVERNAME,
.type = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
.fops = &w9966_fops, .fops = &w9966_fops,
}; };

1
drivers/media/video/w9968cf.c
View file

@ -3550,7 +3550,6 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
} }
strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); strcpy(cam->v4ldev->name, symbolic(camlist, mod_id));
cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
cam->v4ldev->fops = &w9968cf_fops; cam->v4ldev->fops = &w9968cf_fops;
cam->v4ldev->minor = video_nr[dev_nr]; cam->v4ldev->minor = video_nr[dev_nr];
cam->v4ldev->release = video_device_release; cam->v4ldev->release = video_device_release;

1
drivers/media/video/zc0301/zc0301_core.c
View file

@ -1985,7 +1985,6 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
} }
strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera");
cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
cam->v4ldev->fops = &zc0301_fops; cam->v4ldev->fops = &zc0301_fops;
cam->v4ldev->minor = video_nr[dev_nr]; cam->v4ldev->minor = video_nr[dev_nr];
cam->v4ldev->release = video_device_release; cam->v4ldev->release = video_device_release;

2
drivers/media/video/zoran_driver.c
View file

@ -4644,8 +4644,6 @@ static const struct file_operations zoran_fops = {
struct video_device zoran_template __devinitdata = { struct video_device zoran_template __devinitdata = {
.name = ZORAN_NAME, .name = ZORAN_NAME,
.type = ZORAN_VID_TYPE,
.type2 = ZORAN_V4L2_VID_FLAGS,
.fops = &zoran_fops, .fops = &zoran_fops,
.release = &zoran_vdev_release, .release = &zoran_vdev_release,
.minor = -1 .minor = -1

1
drivers/media/video/zr364xx.c
View file

@ -780,7 +780,6 @@ static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = {
static struct video_device zr364xx_template = { static struct video_device zr364xx_template = {
.name = DRIVER_DESC, .name = DRIVER_DESC,
.type = VID_TYPE_CAPTURE,
.fops = &zr364xx_fops, .fops = &zr364xx_fops,
.ioctl_ops = &zr364xx_ioctl_ops, .ioctl_ops = &zr364xx_ioctl_ops,
.release = video_device_release, .release = video_device_release,

3
include/media/v4l2-dev.h
View file

@ -53,8 +53,7 @@ struct video_device
/* device info */ /* device info */
char name[32]; char name[32];
int type; /* v4l1 */ int vfl_type;
int type2; /* v4l2 */
int minor; int minor;
/* attribute to diferentiate multiple indexs on one physical device */ /* attribute to diferentiate multiple indexs on one physical device */
int index; int index;

1
sound/i2c/other/tea575x-tuner.c
View file

@ -190,7 +190,6 @@ void snd_tea575x_init(struct snd_tea575x *tea)
memset(&tea->vd, 0, sizeof(tea->vd)); memset(&tea->vd, 0, sizeof(tea->vd));
strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio"); strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio");
tea->vd.type = VID_TYPE_TUNER;
tea->vd.release = snd_tea575x_release; tea->vd.release = snd_tea575x_release;
video_set_drvdata(&tea->vd, tea); video_set_drvdata(&tea->vd, tea);
tea->vd.fops = &tea->fops; tea->vd.fops = &tea->fops;