diff options
Diffstat (limited to 'drivers/media/video')
44 files changed, 12 insertions, 103 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index dfa399da587d..85bf31ab8789 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -4182,8 +4182,7 @@ static irqreturn_t bttv_irq(int irq, void *dev_id) | |||
4182 | 4182 | ||
4183 | static struct video_device *vdev_init(struct bttv *btv, | 4183 | static struct video_device *vdev_init(struct bttv *btv, |
4184 | const struct video_device *template, | 4184 | const struct video_device *template, |
4185 | const char *type_name, | 4185 | const char *type_name) |
4186 | const int type) | ||
4187 | { | 4186 | { |
4188 | struct video_device *vfd; | 4187 | struct video_device *vfd; |
4189 | 4188 | ||
@@ -4194,7 +4193,6 @@ static struct video_device *vdev_init(struct bttv *btv, | |||
4194 | vfd->minor = -1; | 4193 | vfd->minor = -1; |
4195 | vfd->parent = &btv->c.pci->dev; | 4194 | vfd->parent = &btv->c.pci->dev; |
4196 | vfd->release = video_device_release; | 4195 | vfd->release = video_device_release; |
4197 | vfd->type = type; | ||
4198 | vfd->debug = bttv_debug; | 4196 | vfd->debug = bttv_debug; |
4199 | snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)", | 4197 | snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)", |
4200 | btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "", | 4198 | btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "", |
@@ -4230,20 +4228,11 @@ static void bttv_unregister_video(struct bttv *btv) | |||
4230 | /* register video4linux devices */ | 4228 | /* register video4linux devices */ |
4231 | static int __devinit bttv_register_video(struct bttv *btv) | 4229 | static int __devinit bttv_register_video(struct bttv *btv) |
4232 | { | 4230 | { |
4233 | int video_type = VID_TYPE_CAPTURE | | 4231 | if (no_overlay > 0) |
4234 | VID_TYPE_TUNER | | ||
4235 | VID_TYPE_CLIPPING| | ||
4236 | VID_TYPE_SCALES; | ||
4237 | |||
4238 | if (no_overlay <= 0) { | ||
4239 | bttv_video_template.type |= VID_TYPE_OVERLAY; | ||
4240 | } else { | ||
4241 | printk("bttv: Overlay support disabled.\n"); | 4232 | printk("bttv: Overlay support disabled.\n"); |
4242 | } | ||
4243 | 4233 | ||
4244 | /* video */ | 4234 | /* video */ |
4245 | btv->video_dev = vdev_init(btv, &bttv_video_template, | 4235 | btv->video_dev = vdev_init(btv, &bttv_video_template, "video"); |
4246 | "video", video_type); | ||
4247 | 4236 | ||
4248 | if (NULL == btv->video_dev) | 4237 | if (NULL == btv->video_dev) |
4249 | goto err; | 4238 | goto err; |
@@ -4259,8 +4248,7 @@ static int __devinit bttv_register_video(struct bttv *btv) | |||
4259 | } | 4248 | } |
4260 | 4249 | ||
4261 | /* vbi */ | 4250 | /* vbi */ |
4262 | btv->vbi_dev = vdev_init(btv, &bttv_video_template, | 4251 | btv->vbi_dev = vdev_init(btv, &bttv_video_template, "vbi"); |
4263 | "vbi", VID_TYPE_TUNER | VID_TYPE_TELETEXT); | ||
4264 | 4252 | ||
4265 | if (NULL == btv->vbi_dev) | 4253 | if (NULL == btv->vbi_dev) |
4266 | goto err; | 4254 | goto err; |
@@ -4272,8 +4260,7 @@ static int __devinit bttv_register_video(struct bttv *btv) | |||
4272 | if (!btv->has_radio) | 4260 | if (!btv->has_radio) |
4273 | return 0; | 4261 | return 0; |
4274 | /* radio */ | 4262 | /* radio */ |
4275 | btv->radio_dev = vdev_init(btv, &radio_template, | 4263 | btv->radio_dev = vdev_init(btv, &radio_template, "radio"); |
4276 | "radio", VID_TYPE_TUNER); | ||
4277 | if (NULL == btv->radio_dev) | 4264 | if (NULL == btv->radio_dev) |
4278 | goto err; | 4265 | goto err; |
4279 | if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0) | 4266 | if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0) |
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index ec870c781c02..d3b3268bace8 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c | |||
@@ -908,7 +908,6 @@ static const struct file_operations qcam_fops = { | |||
908 | static struct video_device qcam_template= | 908 | static struct video_device qcam_template= |
909 | { | 909 | { |
910 | .name = "Connectix Quickcam", | 910 | .name = "Connectix Quickcam", |
911 | .type = VID_TYPE_CAPTURE, | ||
912 | .fops = &qcam_fops, | 911 | .fops = &qcam_fops, |
913 | }; | 912 | }; |
914 | 913 | ||
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index 62ed8949d461..fe9379b282d3 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c | |||
@@ -703,7 +703,6 @@ static const struct file_operations qcam_fops = { | |||
703 | static struct video_device qcam_template= | 703 | static struct video_device qcam_template= |
704 | { | 704 | { |
705 | .name = "Colour QuickCam", | 705 | .name = "Colour QuickCam", |
706 | .type = VID_TYPE_CAPTURE, | ||
707 | .fops = &qcam_fops, | 706 | .fops = &qcam_fops, |
708 | }; | 707 | }; |
709 | 708 | ||
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 4bbea458d0c0..c149b7d712e5 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1794,8 +1794,6 @@ static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = { | |||
1794 | 1794 | ||
1795 | static struct video_device cafe_v4l_template = { | 1795 | static struct video_device cafe_v4l_template = { |
1796 | .name = "cafe", | 1796 | .name = "cafe", |
1797 | .type = VFL_TYPE_GRABBER, | ||
1798 | .type2 = VID_TYPE_CAPTURE, | ||
1799 | .minor = -1, /* Get one dynamically */ | 1797 | .minor = -1, /* Get one dynamically */ |
1800 | .tvnorms = V4L2_STD_NTSC_M, | 1798 | .tvnorms = V4L2_STD_NTSC_M, |
1801 | .current_norm = V4L2_STD_NTSC_M, /* make mplayer happy */ | 1799 | .current_norm = V4L2_STD_NTSC_M, /* make mplayer happy */ |
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 5d2ef48137c4..dc8cc6115e2f 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
@@ -3800,7 +3800,6 @@ static const struct file_operations cpia_fops = { | |||
3800 | 3800 | ||
3801 | static struct video_device cpia_template = { | 3801 | static struct video_device cpia_template = { |
3802 | .name = "CPiA Camera", | 3802 | .name = "CPiA Camera", |
3803 | .type = VID_TYPE_CAPTURE, | ||
3804 | .fops = &cpia_fops, | 3803 | .fops = &cpia_fops, |
3805 | }; | 3804 | }; |
3806 | 3805 | ||
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 4e45de78df59..515c8b57a60d 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -1937,9 +1937,6 @@ static const struct file_operations fops_template = { | |||
1937 | static struct video_device cpia2_template = { | 1937 | static struct video_device cpia2_template = { |
1938 | /* I could not find any place for the old .initialize initializer?? */ | 1938 | /* I could not find any place for the old .initialize initializer?? */ |
1939 | .name= "CPiA2 Camera", | 1939 | .name= "CPiA2 Camera", |
1940 | .type= VID_TYPE_CAPTURE, | ||
1941 | .type2 = V4L2_CAP_VIDEO_CAPTURE | | ||
1942 | V4L2_CAP_STREAMING, | ||
1943 | .minor= -1, | 1940 | .minor= -1, |
1944 | .fops= &fops_template, | 1941 | .fops= &fops_template, |
1945 | .release= video_device_release, | 1942 | .release= video_device_release, |
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index 210a2416b320..0da57f583bf7 100644 --- a/drivers/media/video/cx18/cx18-streams.c +++ b/drivers/media/video/cx18/cx18-streams.c | |||
@@ -187,9 +187,6 @@ static int cx18_prep_dev(struct cx18 *cx, int type) | |||
187 | return -ENOMEM; | 187 | return -ENOMEM; |
188 | } | 188 | } |
189 | 189 | ||
190 | s->v4l2dev->type = | ||
191 | VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT | | ||
192 | VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER; | ||
193 | snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d", | 190 | snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d", |
194 | cx->num); | 191 | cx->num); |
195 | 192 | ||
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index 9d15d8a353fa..8118091568fc 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c | |||
@@ -1731,10 +1731,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { | |||
1731 | 1731 | ||
1732 | static struct video_device cx23885_mpeg_template = { | 1732 | static struct video_device cx23885_mpeg_template = { |
1733 | .name = "cx23885", | 1733 | .name = "cx23885", |
1734 | .type = VID_TYPE_CAPTURE | | ||
1735 | VID_TYPE_TUNER | | ||
1736 | VID_TYPE_SCALES | | ||
1737 | VID_TYPE_MPEG_ENCODER, | ||
1738 | .fops = &mpeg_fops, | 1734 | .fops = &mpeg_fops, |
1739 | .ioctl_ops = &mpeg_ioctl_ops, | 1735 | .ioctl_ops = &mpeg_ioctl_ops, |
1740 | .minor = -1, | 1736 | .minor = -1, |
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 308caa2085ba..ad2235dab5b1 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -1472,7 +1472,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1472 | static struct video_device cx23885_vbi_template; | 1472 | static struct video_device cx23885_vbi_template; |
1473 | static struct video_device cx23885_video_template = { | 1473 | static struct video_device cx23885_video_template = { |
1474 | .name = "cx23885-video", | 1474 | .name = "cx23885-video", |
1475 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES, | ||
1476 | .fops = &video_fops, | 1475 | .fops = &video_fops, |
1477 | .minor = -1, | 1476 | .minor = -1, |
1478 | .ioctl_ops = &video_ioctl_ops, | 1477 | .ioctl_ops = &video_ioctl_ops, |
@@ -1517,7 +1516,6 @@ int cx23885_video_register(struct cx23885_dev *dev) | |||
1517 | memcpy(&cx23885_vbi_template, &cx23885_video_template, | 1516 | memcpy(&cx23885_vbi_template, &cx23885_video_template, |
1518 | sizeof(cx23885_vbi_template)); | 1517 | sizeof(cx23885_vbi_template)); |
1519 | strcpy(cx23885_vbi_template.name, "cx23885-vbi"); | 1518 | strcpy(cx23885_vbi_template.name, "cx23885-vbi"); |
1520 | cx23885_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER; | ||
1521 | 1519 | ||
1522 | dev->tvnorm = cx23885_video_template.current_norm; | 1520 | dev->tvnorm = cx23885_video_template.current_norm; |
1523 | 1521 | ||
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 55c35482089e..9a1374a38ec7 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -1207,8 +1207,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { | |||
1207 | 1207 | ||
1208 | static struct video_device cx8802_mpeg_template = { | 1208 | static struct video_device cx8802_mpeg_template = { |
1209 | .name = "cx8802", | 1209 | .name = "cx8802", |
1210 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER | | ||
1211 | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER, | ||
1212 | .fops = &mpeg_fops, | 1210 | .fops = &mpeg_fops, |
1213 | .ioctl_ops = &mpeg_ioctl_ops, | 1211 | .ioctl_ops = &mpeg_ioctl_ops, |
1214 | .minor = -1, | 1212 | .minor = -1, |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 24b403b238d1..ef4d56ea0027 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1722,7 +1722,6 @@ static struct video_device cx8800_vbi_template; | |||
1722 | 1722 | ||
1723 | static struct video_device cx8800_video_template = { | 1723 | static struct video_device cx8800_video_template = { |
1724 | .name = "cx8800-video", | 1724 | .name = "cx8800-video", |
1725 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES, | ||
1726 | .fops = &video_fops, | 1725 | .fops = &video_fops, |
1727 | .minor = -1, | 1726 | .minor = -1, |
1728 | .ioctl_ops = &video_ioctl_ops, | 1727 | .ioctl_ops = &video_ioctl_ops, |
@@ -1761,7 +1760,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { | |||
1761 | 1760 | ||
1762 | static struct video_device cx8800_radio_template = { | 1761 | static struct video_device cx8800_radio_template = { |
1763 | .name = "cx8800-radio", | 1762 | .name = "cx8800-radio", |
1764 | .type = VID_TYPE_TUNER, | ||
1765 | .fops = &radio_fops, | 1763 | .fops = &radio_fops, |
1766 | .minor = -1, | 1764 | .minor = -1, |
1767 | .ioctl_ops = &radio_ioctl_ops, | 1765 | .ioctl_ops = &radio_ioctl_ops, |
@@ -1838,7 +1836,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
1838 | memcpy( &cx8800_vbi_template, &cx8800_video_template, | 1836 | memcpy( &cx8800_vbi_template, &cx8800_video_template, |
1839 | sizeof(cx8800_vbi_template) ); | 1837 | sizeof(cx8800_vbi_template) ); |
1840 | strcpy(cx8800_vbi_template.name,"cx8800-vbi"); | 1838 | strcpy(cx8800_vbi_template.name,"cx8800-vbi"); |
1841 | cx8800_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER; | ||
1842 | 1839 | ||
1843 | /* initialize driver struct */ | 1840 | /* initialize driver struct */ |
1844 | spin_lock_init(&dev->slock); | 1841 | spin_lock_init(&dev->slock); |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index fcfc7413f74c..49ab0629702e 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1845,7 +1845,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { | |||
1845 | 1845 | ||
1846 | static struct video_device em28xx_radio_template = { | 1846 | static struct video_device em28xx_radio_template = { |
1847 | .name = "em28xx-radio", | 1847 | .name = "em28xx-radio", |
1848 | .type = VID_TYPE_TUNER, | ||
1849 | .fops = &radio_fops, | 1848 | .fops = &radio_fops, |
1850 | .ioctl_ops = &radio_ioctl_ops, | 1849 | .ioctl_ops = &radio_ioctl_ops, |
1851 | .minor = -1, | 1850 | .minor = -1, |
@@ -1891,7 +1890,6 @@ EXPORT_SYMBOL(em28xx_unregister_extension); | |||
1891 | 1890 | ||
1892 | static struct video_device *em28xx_vdev_init(struct em28xx *dev, | 1891 | static struct video_device *em28xx_vdev_init(struct em28xx *dev, |
1893 | const struct video_device *template, | 1892 | const struct video_device *template, |
1894 | const int type, | ||
1895 | const char *type_name) | 1893 | const char *type_name) |
1896 | { | 1894 | { |
1897 | struct video_device *vfd; | 1895 | struct video_device *vfd; |
@@ -1903,7 +1901,6 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, | |||
1903 | vfd->minor = -1; | 1901 | vfd->minor = -1; |
1904 | vfd->parent = &dev->udev->dev; | 1902 | vfd->parent = &dev->udev->dev; |
1905 | vfd->release = video_device_release; | 1903 | vfd->release = video_device_release; |
1906 | vfd->type = type; | ||
1907 | vfd->debug = video_debug; | 1904 | vfd->debug = video_debug; |
1908 | 1905 | ||
1909 | snprintf(vfd->name, sizeof(vfd->name), "%s %s", | 1906 | snprintf(vfd->name, sizeof(vfd->name), "%s %s", |
@@ -1981,14 +1978,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
1981 | list_add_tail(&dev->devlist, &em28xx_devlist); | 1978 | list_add_tail(&dev->devlist, &em28xx_devlist); |
1982 | 1979 | ||
1983 | /* allocate and fill video video_device struct */ | 1980 | /* allocate and fill video video_device struct */ |
1984 | dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, | 1981 | dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video"); |
1985 | VID_TYPE_CAPTURE, "video"); | ||
1986 | if (NULL == dev->vdev) { | 1982 | if (NULL == dev->vdev) { |
1987 | em28xx_errdev("cannot allocate video_device.\n"); | 1983 | em28xx_errdev("cannot allocate video_device.\n"); |
1988 | goto fail_unreg; | 1984 | goto fail_unreg; |
1989 | } | 1985 | } |
1990 | if (dev->tuner_type != TUNER_ABSENT) | ||
1991 | dev->vdev->type |= VID_TYPE_TUNER; | ||
1992 | 1986 | ||
1993 | /* register v4l2 video video_device */ | 1987 | /* register v4l2 video video_device */ |
1994 | retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER, | 1988 | 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, | |||
2000 | } | 1994 | } |
2001 | 1995 | ||
2002 | /* Allocate and fill vbi video_device struct */ | 1996 | /* Allocate and fill vbi video_device struct */ |
2003 | dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, | 1997 | dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi"); |
2004 | VFL_TYPE_VBI, "vbi"); | ||
2005 | /* register v4l2 vbi video_device */ | 1998 | /* register v4l2 vbi video_device */ |
2006 | if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI, | 1999 | if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI, |
2007 | vbi_nr[dev->devno]) < 0) { | 2000 | vbi_nr[dev->devno]) < 0) { |
@@ -2011,8 +2004,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
2011 | } | 2004 | } |
2012 | 2005 | ||
2013 | if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { | 2006 | if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { |
2014 | dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, | 2007 | dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio"); |
2015 | VFL_TYPE_RADIO, "radio"); | ||
2016 | if (NULL == dev->radio_dev) { | 2008 | if (NULL == dev->radio_dev) { |
2017 | em28xx_errdev("cannot allocate video_device.\n"); | 2009 | em28xx_errdev("cannot allocate video_device.\n"); |
2018 | goto fail_unreg; | 2010 | goto fail_unreg; |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 3e71ea7bbe24..2d170d101c21 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
@@ -2585,7 +2585,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
2585 | } | 2585 | } |
2586 | 2586 | ||
2587 | strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); | 2587 | strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); |
2588 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | ||
2589 | cam->v4ldev->fops = &et61x251_fops; | 2588 | cam->v4ldev->fops = &et61x251_fops; |
2590 | cam->v4ldev->minor = video_nr[dev_nr]; | 2589 | cam->v4ldev->minor = video_nr[dev_nr]; |
2591 | cam->v4ldev->release = video_device_release; | 2590 | cam->v4ldev->release = video_device_release; |
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index ab053a26023e..bc301bae0482 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -1691,7 +1691,6 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = { | |||
1691 | 1691 | ||
1692 | static struct video_device gspca_template = { | 1692 | static struct video_device gspca_template = { |
1693 | .name = "gspca main driver", | 1693 | .name = "gspca main driver", |
1694 | .type = VID_TYPE_CAPTURE, | ||
1695 | .fops = &dev_fops, | 1694 | .fops = &dev_fops, |
1696 | .ioctl_ops = &dev_ioctl_ops, | 1695 | .ioctl_ops = &dev_ioctl_ops, |
1697 | .release = dev_release, /* mandatory */ | 1696 | .release = dev_release, /* mandatory */ |
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index b883c4e08fbd..54d2023b26c4 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
@@ -208,11 +208,6 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) | |||
208 | return -ENOMEM; | 208 | return -ENOMEM; |
209 | } | 209 | } |
210 | 210 | ||
211 | s->v4l2dev->type = VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT | | ||
212 | VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER; | ||
213 | if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { | ||
214 | s->v4l2dev->type |= VID_TYPE_MPEG_DECODER; | ||
215 | } | ||
216 | snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s", | 211 | snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s", |
217 | itv->num, s->name); | 212 | itv->num, s->name); |
218 | 213 | ||
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index f9a6e1e8b4bd..7c8ef6ac6c39 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1721,7 +1721,6 @@ static const struct v4l2_ioctl_ops meye_ioctl_ops = { | |||
1721 | 1721 | ||
1722 | static struct video_device meye_template = { | 1722 | static struct video_device meye_template = { |
1723 | .name = "meye", | 1723 | .name = "meye", |
1724 | .type = VID_TYPE_CAPTURE, | ||
1725 | .fops = &meye_fops, | 1724 | .fops = &meye_fops, |
1726 | .ioctl_ops = &meye_ioctl_ops, | 1725 | .ioctl_ops = &meye_ioctl_ops, |
1727 | .release = video_device_release, | 1726 | .release = video_device_release, |
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index 2374ebc084d4..9edaca4371d7 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
@@ -4667,7 +4667,6 @@ static const struct file_operations ov511_fops = { | |||
4667 | 4667 | ||
4668 | static struct video_device vdev_template = { | 4668 | static struct video_device vdev_template = { |
4669 | .name = "OV511 USB Camera", | 4669 | .name = "OV511 USB Camera", |
4670 | .type = VID_TYPE_CAPTURE, | ||
4671 | .fops = &ov511_fops, | 4670 | .fops = &ov511_fops, |
4672 | .release = video_device_release, | 4671 | .release = video_device_release, |
4673 | .minor = -1, | 4672 | .minor = -1, |
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index 8c72e4df85ab..00425d743656 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c | |||
@@ -896,7 +896,6 @@ static const struct file_operations pms_fops = { | |||
896 | static struct video_device pms_template= | 896 | static struct video_device pms_template= |
897 | { | 897 | { |
898 | .name = "Mediavision PMS", | 898 | .name = "Mediavision PMS", |
899 | .type = VID_TYPE_CAPTURE, | ||
900 | .fops = &pms_fops, | 899 | .fops = &pms_fops, |
901 | }; | 900 | }; |
902 | 901 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index ceb549ac752d..00306faeac01 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -1161,10 +1161,6 @@ static const struct file_operations vdev_fops = { | |||
1161 | 1161 | ||
1162 | 1162 | ||
1163 | static struct video_device vdev_template = { | 1163 | static struct video_device vdev_template = { |
1164 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, | ||
1165 | .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE | ||
1166 | | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | ||
1167 | | V4L2_CAP_READWRITE), | ||
1168 | .fops = &vdev_fops, | 1164 | .fops = &vdev_fops, |
1169 | }; | 1165 | }; |
1170 | 1166 | ||
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 436a47caf52d..9aee7cb6f79a 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -166,7 +166,6 @@ static const struct file_operations pwc_fops = { | |||
166 | }; | 166 | }; |
167 | static struct video_device pwc_template = { | 167 | static struct video_device pwc_template = { |
168 | .name = "Philips Webcam", /* Filled in later */ | 168 | .name = "Philips Webcam", /* Filled in later */ |
169 | .type = VID_TYPE_CAPTURE, | ||
170 | .release = video_device_release, | 169 | .release = video_device_release, |
171 | .fops = &pwc_fops, | 170 | .fops = &pwc_fops, |
172 | .minor = -1, | 171 | .minor = -1, |
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index 92dfb1845ff4..b1d09d8e2b85 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
@@ -1705,7 +1705,6 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = { | |||
1705 | 1705 | ||
1706 | static struct video_device template = { | 1706 | static struct video_device template = { |
1707 | .name = "s2255v", | 1707 | .name = "s2255v", |
1708 | .type = VID_TYPE_CAPTURE, | ||
1709 | .fops = &s2255_fops_v4l, | 1708 | .fops = &s2255_fops_v4l, |
1710 | .ioctl_ops = &s2255_ioctl_ops, | 1709 | .ioctl_ops = &s2255_ioctl_ops, |
1711 | .minor = -1, | 1710 | .minor = -1, |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index e6a3fa482982..6ee63e69b36c 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -831,7 +831,6 @@ static const struct file_operations saa_fops = { | |||
831 | static struct video_device saa_template = | 831 | static struct video_device saa_template = |
832 | { | 832 | { |
833 | .name = IF_NAME, | 833 | .name = IF_NAME, |
834 | .type = VID_TYPE_TELETEXT, | ||
835 | .fops = &saa_fops, | 834 | .fops = &saa_fops, |
836 | .release = video_device_release, | 835 | .release = video_device_release, |
837 | .minor = -1, | 836 | .minor = -1, |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 6f14619bda4a..0d639738d4e6 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -712,7 +712,6 @@ static const struct file_operations saa_fops = { | |||
712 | static struct video_device saa_template = | 712 | static struct video_device saa_template = |
713 | { | 713 | { |
714 | .name = IF_NAME, | 714 | .name = IF_NAME, |
715 | .type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */ | ||
716 | .fops = &saa_fops, | 715 | .fops = &saa_fops, |
717 | }; | 716 | }; |
718 | 717 | ||
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index a404368308aa..75d618415f4f 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -1008,11 +1008,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
1008 | v4l2_prio_init(&dev->prio); | 1008 | v4l2_prio_init(&dev->prio); |
1009 | 1009 | ||
1010 | /* register v4l devices */ | 1010 | /* register v4l devices */ |
1011 | if (saa7134_no_overlay <= 0) { | 1011 | if (saa7134_no_overlay > 0) |
1012 | saa7134_video_template.type |= VID_TYPE_OVERLAY; | 1012 | printk(KERN_INFO "%s: Overlay support disabled.\n", dev->name); |
1013 | } else { | 1013 | |
1014 | printk("%s: Overlay support disabled.\n",dev->name); | ||
1015 | } | ||
1016 | dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); | 1014 | dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); |
1017 | err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, | 1015 | err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, |
1018 | video_nr[dev->nr]); | 1016 | video_nr[dev->nr]); |
@@ -1025,7 +1023,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
1025 | dev->name,dev->video_dev->minor & 0x1f); | 1023 | dev->name,dev->video_dev->minor & 0x1f); |
1026 | 1024 | ||
1027 | dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); | 1025 | dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); |
1028 | dev->vbi_dev->type = VID_TYPE_TUNER | VID_TYPE_TELETEXT; | ||
1029 | 1026 | ||
1030 | err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, | 1027 | err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, |
1031 | vbi_nr[dev->nr]); | 1028 | vbi_nr[dev->nr]); |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index cd52d5be404d..c0c5d7509c25 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -439,8 +439,6 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = { | |||
439 | 439 | ||
440 | static struct video_device saa7134_empress_template = { | 440 | static struct video_device saa7134_empress_template = { |
441 | .name = "saa7134-empress", | 441 | .name = "saa7134-empress", |
442 | .type = 0 /* FIXME */, | ||
443 | .type2 = 0 /* FIXME */, | ||
444 | .fops = &ts_fops, | 442 | .fops = &ts_fops, |
445 | .minor = -1, | 443 | .minor = -1, |
446 | .ioctl_ops = &ts_ioctl_ops, | 444 | .ioctl_ops = &ts_ioctl_ops, |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index eb824897416b..68c268981861 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -2451,8 +2451,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { | |||
2451 | 2451 | ||
2452 | struct video_device saa7134_video_template = { | 2452 | struct video_device saa7134_video_template = { |
2453 | .name = "saa7134-video", | 2453 | .name = "saa7134-video", |
2454 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER | | ||
2455 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, | ||
2456 | .fops = &video_fops, | 2454 | .fops = &video_fops, |
2457 | .ioctl_ops = &video_ioctl_ops, | 2455 | .ioctl_ops = &video_ioctl_ops, |
2458 | .minor = -1, | 2456 | .minor = -1, |
@@ -2462,7 +2460,6 @@ struct video_device saa7134_video_template = { | |||
2462 | 2460 | ||
2463 | struct video_device saa7134_radio_template = { | 2461 | struct video_device saa7134_radio_template = { |
2464 | .name = "saa7134-radio", | 2462 | .name = "saa7134-radio", |
2465 | .type = VID_TYPE_TUNER, | ||
2466 | .fops = &radio_fops, | 2463 | .fops = &radio_fops, |
2467 | .ioctl_ops = &radio_ioctl_ops, | 2464 | .ioctl_ops = &radio_ioctl_ops, |
2468 | .minor = -1, | 2465 | .minor = -1, |
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index b4dd60b0f8f2..f481277892da 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
@@ -1231,7 +1231,6 @@ static const struct file_operations se401_fops = { | |||
1231 | }; | 1231 | }; |
1232 | static struct video_device se401_template = { | 1232 | static struct video_device se401_template = { |
1233 | .name = "se401 USB camera", | 1233 | .name = "se401 USB camera", |
1234 | .type = VID_TYPE_CAPTURE, | ||
1235 | .fops = &se401_fops, | 1234 | .fops = &se401_fops, |
1236 | }; | 1235 | }; |
1237 | 1236 | ||
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index c68bf0921e9e..23408764d0ef 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -3309,7 +3309,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3309 | } | 3309 | } |
3310 | 3310 | ||
3311 | strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); | 3311 | strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); |
3312 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | ||
3313 | cam->v4ldev->fops = &sn9c102_fops; | 3312 | cam->v4ldev->fops = &sn9c102_fops; |
3314 | cam->v4ldev->minor = video_nr[dev_nr]; | 3313 | cam->v4ldev->minor = video_nr[dev_nr]; |
3315 | cam->v4ldev->release = video_device_release; | 3314 | cam->v4ldev->release = video_device_release; |
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 9ff561452587..b6be5ee678b6 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -908,7 +908,6 @@ int soc_camera_video_start(struct soc_camera_device *icd) | |||
908 | strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name)); | 908 | strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name)); |
909 | /* Maybe better &ici->dev */ | 909 | /* Maybe better &ici->dev */ |
910 | vdev->parent = &icd->dev; | 910 | vdev->parent = &icd->dev; |
911 | vdev->type = VID_TYPE_CAPTURE; | ||
912 | vdev->current_norm = V4L2_STD_UNKNOWN; | 911 | vdev->current_norm = V4L2_STD_UNKNOWN; |
913 | vdev->fops = &soc_camera_fops; | 912 | vdev->fops = &soc_camera_fops; |
914 | vdev->ioctl_ops = &soc_camera_ioctl_ops; | 913 | vdev->ioctl_ops = &soc_camera_ioctl_ops; |
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index a8a72768ca91..ad36af30e099 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -1359,8 +1359,6 @@ static void stk_v4l_dev_release(struct video_device *vd) | |||
1359 | 1359 | ||
1360 | static struct video_device stk_v4l_data = { | 1360 | static struct video_device stk_v4l_data = { |
1361 | .name = "stkwebcam", | 1361 | .name = "stkwebcam", |
1362 | .type = VFL_TYPE_GRABBER, | ||
1363 | .type2 = VID_TYPE_CAPTURE, | ||
1364 | .minor = -1, | 1362 | .minor = -1, |
1365 | .tvnorms = V4L2_STD_UNKNOWN, | 1363 | .tvnorms = V4L2_STD_UNKNOWN, |
1366 | .current_norm = V4L2_STD_UNKNOWN, | 1364 | .current_norm = V4L2_STD_UNKNOWN, |
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index 6ace8923b797..276bded06ab3 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -1919,7 +1919,6 @@ static const struct file_operations saa_fops = { | |||
1919 | /* template for video_device-structure */ | 1919 | /* template for video_device-structure */ |
1920 | static struct video_device saa_template = { | 1920 | static struct video_device saa_template = { |
1921 | .name = "SAA7146A", | 1921 | .name = "SAA7146A", |
1922 | .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY, | ||
1923 | .fops = &saa_fops, | 1922 | .fops = &saa_fops, |
1924 | .minor = -1, | 1923 | .minor = -1, |
1925 | }; | 1924 | }; |
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 9053d5a0b1c3..56dc3d6b5b29 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
@@ -1403,7 +1403,6 @@ static const struct file_operations stv680_fops = { | |||
1403 | }; | 1403 | }; |
1404 | static struct video_device stv680_template = { | 1404 | static struct video_device stv680_template = { |
1405 | .name = "STV0680 USB camera", | 1405 | .name = "STV0680 USB camera", |
1406 | .type = VID_TYPE_CAPTURE, | ||
1407 | .fops = &stv680_fops, | 1406 | .fops = &stv680_fops, |
1408 | .release = video_device_release, | 1407 | .release = video_device_release, |
1409 | .minor = -1, | 1408 | .minor = -1, |
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 357cee40fb38..bf1bc2f69b02 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -952,7 +952,6 @@ static const struct file_operations usbvideo_fops = { | |||
952 | .llseek = no_llseek, | 952 | .llseek = no_llseek, |
953 | }; | 953 | }; |
954 | static const struct video_device usbvideo_template = { | 954 | static const struct video_device usbvideo_template = { |
955 | .type = VID_TYPE_CAPTURE, | ||
956 | .fops = &usbvideo_fops, | 955 | .fops = &usbvideo_fops, |
957 | }; | 956 | }; |
958 | 957 | ||
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index b8e8fceee525..b7792451a299 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -793,7 +793,6 @@ static const struct file_operations vicam_fops = { | |||
793 | 793 | ||
794 | static struct video_device vicam_template = { | 794 | static struct video_device vicam_template = { |
795 | .name = "ViCam-based USB Camera", | 795 | .name = "ViCam-based USB Camera", |
796 | .type = VID_TYPE_CAPTURE, | ||
797 | .fops = &vicam_fops, | 796 | .fops = &vicam_fops, |
798 | .minor = -1, | 797 | .minor = -1, |
799 | }; | 798 | }; |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index a65e5db0a325..b977116a0dd9 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -1405,7 +1405,6 @@ static const struct v4l2_ioctl_ops usbvision_ioctl_ops = { | |||
1405 | }; | 1405 | }; |
1406 | 1406 | ||
1407 | static struct video_device usbvision_video_template = { | 1407 | static struct video_device usbvision_video_template = { |
1408 | .type = VID_TYPE_TUNER | VID_TYPE_CAPTURE, | ||
1409 | .fops = &usbvision_fops, | 1408 | .fops = &usbvision_fops, |
1410 | .ioctl_ops = &usbvision_ioctl_ops, | 1409 | .ioctl_ops = &usbvision_ioctl_ops, |
1411 | .name = "usbvision-video", | 1410 | .name = "usbvision-video", |
@@ -1443,7 +1442,6 @@ static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = { | |||
1443 | }; | 1442 | }; |
1444 | 1443 | ||
1445 | static struct video_device usbvision_radio_template = { | 1444 | static struct video_device usbvision_radio_template = { |
1446 | .type = VID_TYPE_TUNER, | ||
1447 | .fops = &usbvision_radio_fops, | 1445 | .fops = &usbvision_radio_fops, |
1448 | .name = "usbvision-radio", | 1446 | .name = "usbvision-radio", |
1449 | .release = video_device_release, | 1447 | .release = video_device_release, |
@@ -1466,7 +1464,6 @@ static const struct file_operations usbvision_vbi_fops = { | |||
1466 | 1464 | ||
1467 | static struct video_device usbvision_vbi_template= | 1465 | static struct video_device usbvision_vbi_template= |
1468 | { | 1466 | { |
1469 | .type = VID_TYPE_TUNER, | ||
1470 | .fops = &usbvision_vbi_fops, | 1467 | .fops = &usbvision_vbi_fops, |
1471 | .release = video_device_release, | 1468 | .release = video_device_release, |
1472 | .name = "usbvision-vbi", | 1469 | .name = "usbvision-vbi", |
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 79d6821c4741..b3c4d75e8490 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
@@ -1459,8 +1459,6 @@ static int uvc_register_video(struct uvc_device *dev) | |||
1459 | * get another one. | 1459 | * get another one. |
1460 | */ | 1460 | */ |
1461 | vdev->parent = &dev->intf->dev; | 1461 | vdev->parent = &dev->intf->dev; |
1462 | vdev->type = 0; | ||
1463 | vdev->type2 = 0; | ||
1464 | vdev->minor = -1; | 1462 | vdev->minor = -1; |
1465 | vdev->fops = &uvc_fops; | 1463 | vdev->fops = &uvc_fops; |
1466 | vdev->release = video_device_release; | 1464 | vdev->release = video_device_release; |
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 88eeee1d8baf..556615fe93de 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c | |||
@@ -302,6 +302,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, | |||
302 | } | 302 | } |
303 | } | 303 | } |
304 | video_device[i] = vfd; | 304 | video_device[i] = vfd; |
305 | vfd->vfl_type = type; | ||
305 | vfd->minor = i; | 306 | vfd->minor = i; |
306 | 307 | ||
307 | ret = get_index(vfd, index); | 308 | ret = get_index(vfd, index); |
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index f0fcb008b723..3989b0eded28 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -4385,8 +4385,6 @@ static const struct file_operations vino_fops = { | |||
4385 | 4385 | ||
4386 | static struct video_device v4l_device_template = { | 4386 | static struct video_device v4l_device_template = { |
4387 | .name = "NOT SET", | 4387 | .name = "NOT SET", |
4388 | /*.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | */ | ||
4389 | /* VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY */ | ||
4390 | .fops = &vino_fops, | 4388 | .fops = &vino_fops, |
4391 | .minor = -1, | 4389 | .minor = -1, |
4392 | }; | 4390 | }; |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 639210e52647..3518af071a2e 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -1092,7 +1092,6 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { | |||
1092 | 1092 | ||
1093 | static struct video_device vivi_template = { | 1093 | static struct video_device vivi_template = { |
1094 | .name = "vivi", | 1094 | .name = "vivi", |
1095 | .type = VID_TYPE_CAPTURE, | ||
1096 | .fops = &vivi_fops, | 1095 | .fops = &vivi_fops, |
1097 | .ioctl_ops = &vivi_ioctl_ops, | 1096 | .ioctl_ops = &vivi_ioctl_ops, |
1098 | .minor = -1, | 1097 | .minor = -1, |
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 925b4e7b557d..9402f40095b4 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
@@ -197,7 +197,6 @@ static const struct file_operations w9966_fops = { | |||
197 | }; | 197 | }; |
198 | static struct video_device w9966_template = { | 198 | static struct video_device w9966_template = { |
199 | .name = W9966_DRIVERNAME, | 199 | .name = W9966_DRIVERNAME, |
200 | .type = VID_TYPE_CAPTURE | VID_TYPE_SCALES, | ||
201 | .fops = &w9966_fops, | 200 | .fops = &w9966_fops, |
202 | }; | 201 | }; |
203 | 202 | ||
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 8f665953c80c..168baabe4659 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -3550,7 +3550,6 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3550 | } | 3550 | } |
3551 | 3551 | ||
3552 | strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); | 3552 | strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); |
3553 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | ||
3554 | cam->v4ldev->fops = &w9968cf_fops; | 3553 | cam->v4ldev->fops = &w9968cf_fops; |
3555 | cam->v4ldev->minor = video_nr[dev_nr]; | 3554 | cam->v4ldev->minor = video_nr[dev_nr]; |
3556 | cam->v4ldev->release = video_device_release; | 3555 | cam->v4ldev->release = video_device_release; |
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c index 0978a7e946b4..550ce7bd5c87 100644 --- a/drivers/media/video/zc0301/zc0301_core.c +++ b/drivers/media/video/zc0301/zc0301_core.c | |||
@@ -1985,7 +1985,6 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
1985 | } | 1985 | } |
1986 | 1986 | ||
1987 | strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); | 1987 | strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); |
1988 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | ||
1989 | cam->v4ldev->fops = &zc0301_fops; | 1988 | cam->v4ldev->fops = &zc0301_fops; |
1990 | cam->v4ldev->minor = video_nr[dev_nr]; | 1989 | cam->v4ldev->minor = video_nr[dev_nr]; |
1991 | cam->v4ldev->release = video_device_release; | 1990 | cam->v4ldev->release = video_device_release; |
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index 3ca58221d5a9..ec6f59674b10 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
@@ -4644,8 +4644,6 @@ static const struct file_operations zoran_fops = { | |||
4644 | 4644 | ||
4645 | struct video_device zoran_template __devinitdata = { | 4645 | struct video_device zoran_template __devinitdata = { |
4646 | .name = ZORAN_NAME, | 4646 | .name = ZORAN_NAME, |
4647 | .type = ZORAN_VID_TYPE, | ||
4648 | .type2 = ZORAN_V4L2_VID_FLAGS, | ||
4649 | .fops = &zoran_fops, | 4647 | .fops = &zoran_fops, |
4650 | .release = &zoran_vdev_release, | 4648 | .release = &zoran_vdev_release, |
4651 | .minor = -1 | 4649 | .minor = -1 |
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c index 36ba36a5e2ea..18d1c4ba79fb 100644 --- a/drivers/media/video/zr364xx.c +++ b/drivers/media/video/zr364xx.c | |||
@@ -780,7 +780,6 @@ static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = { | |||
780 | 780 | ||
781 | static struct video_device zr364xx_template = { | 781 | static struct video_device zr364xx_template = { |
782 | .name = DRIVER_DESC, | 782 | .name = DRIVER_DESC, |
783 | .type = VID_TYPE_CAPTURE, | ||
784 | .fops = &zr364xx_fops, | 783 | .fops = &zr364xx_fops, |
785 | .ioctl_ops = &zr364xx_ioctl_ops, | 784 | .ioctl_ops = &zr364xx_ioctl_ops, |
786 | .release = video_device_release, | 785 | .release = video_device_release, |