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: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

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)
 
 static struct video_device *vdev_init(struct bttv *btv,
                                       const struct video_device *template,
-                                      const char *type_name,
-                                      const int type)
+                                      const char *type_name)
 {
         struct video_device *vfd;
 
@@ -4194,7 +4193,6 @@ static struct video_device *vdev_init(struct bttv *btv,
         vfd->minor   = -1;
         vfd->parent  = &btv->c.pci->dev;
         vfd->release = video_device_release;
-        vfd->type    = type;
         vfd->debug   = bttv_debug;
         snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
                  btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "",
@@ -4230,20 +4228,11 @@ static void bttv_unregister_video(struct bttv *btv)
 /* register video4linux devices */
 static int __devinit bttv_register_video(struct bttv *btv)
 {
-        int video_type = VID_TYPE_CAPTURE |
-                         VID_TYPE_TUNER   |
-                         VID_TYPE_CLIPPING|
-                         VID_TYPE_SCALES;
-
-        if (no_overlay <= 0) {
-                bttv_video_template.type |= VID_TYPE_OVERLAY;
-        } else {
+        if (no_overlay > 0)
                 printk("bttv: Overlay support disabled.\n");
-        }
 
         /* video */
-        btv->video_dev = vdev_init(btv, &bttv_video_template,
-                                   "video", video_type);
+        btv->video_dev = vdev_init(btv, &bttv_video_template, "video");
 
         if (NULL == btv->video_dev)
                 goto err;
@@ -4259,8 +4248,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
         }
 
         /* vbi */
-        btv->vbi_dev = vdev_init(btv, &bttv_video_template,
-                                 "vbi", VID_TYPE_TUNER | VID_TYPE_TELETEXT);
+        btv->vbi_dev = vdev_init(btv, &bttv_video_template, "vbi");
 
         if (NULL == btv->vbi_dev)
                 goto err;
@@ -4272,8 +4260,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
         if (!btv->has_radio)
                 return 0;
         /* radio */
-        btv->radio_dev = vdev_init(btv, &radio_template,
-                                   "radio", VID_TYPE_TUNER);
+        btv->radio_dev = vdev_init(btv, &radio_template, "radio");
         if (NULL == btv->radio_dev)
                 goto err;
         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 = {
 static struct video_device qcam_template=
 {
         .name           = "Connectix Quickcam",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &qcam_fops,
 };
 
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 = {
 static struct video_device qcam_template=
 {
         .name           = "Colour QuickCam",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &qcam_fops,
 };
 
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 = {
 
 static struct video_device cafe_v4l_template = {
         .name = "cafe",
-        .type = VFL_TYPE_GRABBER,
-        .type2 = VID_TYPE_CAPTURE,
         .minor = -1, /* Get one dynamically */
         .tvnorms = V4L2_STD_NTSC_M,
         .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 = {
 
 static struct video_device cpia_template = {
         .name           = "CPiA Camera",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &cpia_fops,
 };
 
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 = {
 static struct video_device cpia2_template = {
         /* I could not find any place for the old .initialize initializer?? */
         .name=          "CPiA2 Camera",
-        .type=          VID_TYPE_CAPTURE,
-        .type2 =        V4L2_CAP_VIDEO_CAPTURE |
-                        V4L2_CAP_STREAMING,
         .minor=         -1,
         .fops=          &fops_template,
         .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)
                 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",
                         cx->num);
 
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 = {
 
 static struct video_device cx23885_mpeg_template = {
         .name          = "cx23885",
-        .type          = VID_TYPE_CAPTURE |
-                                VID_TYPE_TUNER |
-                                VID_TYPE_SCALES |
-                                VID_TYPE_MPEG_ENCODER,
         .fops          = &mpeg_fops,
         .ioctl_ops     = &mpeg_ioctl_ops,
         .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 = {
 static struct video_device cx23885_vbi_template;
 static struct video_device cx23885_video_template = {
         .name                 = "cx23885-video",
-        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
         .fops                 = &video_fops,
         .minor                = -1,
         .ioctl_ops            = &video_ioctl_ops,
@@ -1517,7 +1516,6 @@ int cx23885_video_register(struct cx23885_dev *dev)
         memcpy(&cx23885_vbi_template, &cx23885_video_template,
                 sizeof(cx23885_vbi_template));
         strcpy(cx23885_vbi_template.name, "cx23885-vbi");
-        cx23885_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
 
         dev->tvnorm = cx23885_video_template.current_norm;
 
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 = {
 
 static struct video_device cx8802_mpeg_template = {
         .name                 = "cx8802",
-        .type                 = VID_TYPE_CAPTURE | VID_TYPE_TUNER |
-                                VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER,
         .fops                 = &mpeg_fops,
         .ioctl_ops            = &mpeg_ioctl_ops,
         .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;
 
 static struct video_device cx8800_video_template = {
         .name                 = "cx8800-video",
-        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
         .fops                 = &video_fops,
         .minor                = -1,
         .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 = {
         .name                 = "cx8800-radio",
-        .type                 = VID_TYPE_TUNER,
         .fops                 = &radio_fops,
         .minor                = -1,
         .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,
                 sizeof(cx8800_vbi_template) );
         strcpy(cx8800_vbi_template.name,"cx8800-vbi");
-        cx8800_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
 
         /* initialize driver struct */
         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 = {
 
 static struct video_device em28xx_radio_template = {
         .name                 = "em28xx-radio",
-        .type                 = VID_TYPE_TUNER,
         .fops                 = &radio_fops,
         .ioctl_ops            = &radio_ioctl_ops,
         .minor                = -1,
@@ -1891,7 +1890,6 @@ EXPORT_SYMBOL(em28xx_unregister_extension);
 
 static struct video_device *em28xx_vdev_init(struct em28xx *dev,
                                              const struct video_device *template,
-                                             const int type,
                                              const char *type_name)
 {
         struct video_device *vfd;
@@ -1903,7 +1901,6 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
         vfd->minor   = -1;
         vfd->parent = &dev->udev->dev;
         vfd->release = video_device_release;
-        vfd->type = type;
         vfd->debug = video_debug;
 
         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);
 
         /* allocate and fill video video_device struct */
-        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template,
-                                          VID_TYPE_CAPTURE, "video");
+        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
         if (NULL == dev->vdev) {
                 em28xx_errdev("cannot allocate video_device.\n");
                 goto fail_unreg;
         }
-        if (dev->tuner_type != TUNER_ABSENT)
-                dev->vdev->type |= VID_TYPE_TUNER;
 
         /* register v4l2 video video_device */
         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 */
-        dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template,
-                                          VFL_TYPE_VBI, "vbi");
+        dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
         /* register v4l2 vbi video_device */
         if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
                                         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) {
-                dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template,
-                                        VFL_TYPE_RADIO, "radio");
+                dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
                 if (NULL == dev->radio_dev) {
                         em28xx_errdev("cannot allocate video_device.\n");
                         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)
         }
 
         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->minor = video_nr[dev_nr];
         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 = {
 
 static struct video_device gspca_template = {
         .name = "gspca main driver",
-        .type = VID_TYPE_CAPTURE,
         .fops = &dev_fops,
         .ioctl_ops = &dev_ioctl_ops,
         .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)
                 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",
                         itv->num, s->name);
 
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 = {
 
 static struct video_device meye_template = {
         .name           = "meye",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &meye_fops,
         .ioctl_ops      = &meye_ioctl_ops,
         .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 = {
 
 static struct video_device vdev_template = {
         .name =         "OV511 USB Camera",
-        .type =         VID_TYPE_CAPTURE,
         .fops =         &ov511_fops,
         .release =      video_device_release,
         .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 = {
 static struct video_device pms_template=
 {
         .name           = "Mediavision PMS",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &pms_fops,
 };
 
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 = {
 
 
 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,
 };
 
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 = {
 };
 static struct video_device pwc_template = {
         .name =         "Philips Webcam",       /* Filled in later */
-        .type =         VID_TYPE_CAPTURE,
         .release =      video_device_release,
         .fops =         &pwc_fops,
         .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 = {
 
 static struct video_device template = {
         .name = "s2255v",
-        .type = VID_TYPE_CAPTURE,
         .fops = &s2255_fops_v4l,
         .ioctl_ops = &s2255_ioctl_ops,
         .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 = {
 static struct video_device saa_template =
 {
         .name     = IF_NAME,
-        .type     = VID_TYPE_TELETEXT,
         .fops     = &saa_fops,
         .release  = video_device_release,
         .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 = {
 static struct video_device saa_template =
 {
         .name           = IF_NAME,
-        .type           = VID_TYPE_TELETEXT,    /*| VID_TYPE_TUNER ?? */
         .fops           = &saa_fops,
 };
 
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,
         v4l2_prio_init(&dev->prio);
 
         /* register v4l devices */
-        if (saa7134_no_overlay <= 0) {
-                saa7134_video_template.type |= VID_TYPE_OVERLAY;
-        } else {
-                printk("%s: Overlay support disabled.\n",dev->name);
-        }
+        if (saa7134_no_overlay > 0)
+                printk(KERN_INFO "%s: Overlay support disabled.\n", dev->name);
+
         dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");
         err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
                                     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->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,
                                     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 = {
 
 static struct video_device saa7134_empress_template = {
         .name          = "saa7134-empress",
-        .type          = 0 /* FIXME */,
-        .type2         = 0 /* FIXME */,
         .fops          = &ts_fops,
         .minor         = -1,
         .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 = {
 
 struct video_device saa7134_video_template = {
         .name                           = "saa7134-video",
-        .type                           = VID_TYPE_CAPTURE|VID_TYPE_TUNER |
-                                        VID_TYPE_CLIPPING|VID_TYPE_SCALES,
         .fops                           = &video_fops,
         .ioctl_ops                      = &video_ioctl_ops,
         .minor                          = -1,
@@ -2462,7 +2460,6 @@ struct video_device saa7134_video_template = {
 
 struct video_device saa7134_radio_template = {
         .name                   = "saa7134-radio",
-        .type                   = VID_TYPE_TUNER,
         .fops                   = &radio_fops,
         .ioctl_ops              = &radio_ioctl_ops,
         .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 = {
 };
 static struct video_device se401_template = {
         .name =         "se401 USB camera",
-        .type =         VID_TYPE_CAPTURE,
         .fops =         &se401_fops,
 };
 
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)
         }
 
         strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &sn9c102_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         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)
         strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name));
         /* Maybe better &ici->dev */
         vdev->parent            = &icd->dev;
-        vdev->type              = VID_TYPE_CAPTURE;
         vdev->current_norm      = V4L2_STD_UNKNOWN;
         vdev->fops              = &soc_camera_fops;
         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)
 
 static struct video_device stk_v4l_data = {
         .name = "stkwebcam",
-        .type = VFL_TYPE_GRABBER,
-        .type2 = VID_TYPE_CAPTURE,
         .minor = -1,
         .tvnorms = V4L2_STD_UNKNOWN,
         .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 = {
 /* template for video_device-structure */
 static struct video_device saa_template = {
         .name = "SAA7146A",
-        .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
         .fops = &saa_fops,
         .minor = -1,
 };
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 = {
 };
 static struct video_device stv680_template = {
         .name =         "STV0680 USB camera",
-        .type =         VID_TYPE_CAPTURE,
         .fops =         &stv680_fops,
         .release =      video_device_release,
         .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 = {
         .llseek = no_llseek,
 };
 static const struct video_device usbvideo_template = {
-        .type =       VID_TYPE_CAPTURE,
         .fops =       &usbvideo_fops,
 };
 
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 = {
 
 static struct video_device vicam_template = {
         .name           = "ViCam-based USB Camera",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &vicam_fops,
         .minor          = -1,
 };
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 = {
 };
 
 static struct video_device usbvision_video_template = {
-        .type           = VID_TYPE_TUNER | VID_TYPE_CAPTURE,
         .fops           = &usbvision_fops,
         .ioctl_ops      = &usbvision_ioctl_ops,
         .name           = "usbvision-video",
@@ -1443,7 +1442,6 @@ static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = {
 };
 
 static struct video_device usbvision_radio_template = {
-        .type           = VID_TYPE_TUNER,
         .fops           = &usbvision_radio_fops,
         .name           = "usbvision-radio",
         .release        = video_device_release,
@@ -1466,7 +1464,6 @@ static const struct file_operations usbvision_vbi_fops = {
 
 static struct video_device usbvision_vbi_template=
 {
-        .type           = VID_TYPE_TUNER,
         .fops           = &usbvision_vbi_fops,
         .release        = video_device_release,
         .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)
          * get another one.
          */
         vdev->parent = &dev->intf->dev;
-        vdev->type = 0;
-        vdev->type2 = 0;
         vdev->minor = -1;
         vdev->fops = &uvc_fops;
         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,
                 }
         }
         video_device[i] = vfd;
+        vfd->vfl_type = type;
         vfd->minor = i;
 
         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 = {
 
 static struct video_device v4l_device_template = {
         .name           = "NOT SET",
-        /*.type         = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | */
-        /*      VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY */
         .fops           = &vino_fops,
         .minor          = -1,
 };
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 = {
 
 static struct video_device vivi_template = {
         .name           = "vivi",
-        .type           = VID_TYPE_CAPTURE,
         .fops           = &vivi_fops,
         .ioctl_ops      = &vivi_ioctl_ops,
         .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 = {
 };
 static struct video_device w9966_template = {
         .name           = W9966_DRIVERNAME,
-        .type           = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
         .fops           = &w9966_fops,
 };
 
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)
         }
 
         strcpy(cam->v4ldev->name, symbolic(camlist, mod_id));
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &w9968cf_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         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)
         }
 
         strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera");
-        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &zc0301_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         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 = {
 
 struct video_device zoran_template __devinitdata = {
         .name = ZORAN_NAME,
-        .type = ZORAN_VID_TYPE,
-        .type2 = ZORAN_V4L2_VID_FLAGS,
         .fops = &zoran_fops,
         .release = &zoran_vdev_release,
         .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 = {
 
 static struct video_device zr364xx_template = {
         .name = DRIVER_DESC,
-        .type = VID_TYPE_CAPTURE,
         .fops = &zr364xx_fops,
         .ioctl_ops = &zr364xx_ioctl_ops,
         .release = video_device_release,