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>

2 files changed, 0 insertions, 5 deletions

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);