diff options
Diffstat (limited to 'drivers')
32 files changed, 10 insertions, 52 deletions
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c index c7c9d1dc0690..3ae56fef8c92 100644 --- a/drivers/media/radio/miropcm20-radio.c +++ b/drivers/media/radio/miropcm20-radio.c | |||
@@ -229,7 +229,6 @@ static struct video_device pcm20_radio = { | |||
229 | .owner = THIS_MODULE, | 229 | .owner = THIS_MODULE, |
230 | .name = "Miro PCM 20 radio", | 230 | .name = "Miro PCM 20 radio", |
231 | .type = VID_TYPE_TUNER, | 231 | .type = VID_TYPE_TUNER, |
232 | .hardware = VID_HARDWARE_RTRACK, | ||
233 | .fops = &pcm20_fops, | 232 | .fops = &pcm20_fops, |
234 | .priv = &pcm20_unit | 233 | .priv = &pcm20_unit |
235 | }; | 234 | }; |
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 19e9929ffa0f..c94a4d0f2804 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -755,7 +755,6 @@ static struct video_device ar_template = { | |||
755 | .owner = THIS_MODULE, | 755 | .owner = THIS_MODULE, |
756 | .name = "Colour AR VGA", | 756 | .name = "Colour AR VGA", |
757 | .type = VID_TYPE_CAPTURE, | 757 | .type = VID_TYPE_CAPTURE, |
758 | .hardware = VID_HARDWARE_ARV, | ||
759 | .fops = &ar_fops, | 758 | .fops = &ar_fops, |
760 | .release = ar_release, | 759 | .release = ar_release, |
761 | .minor = -1, | 760 | .minor = -1, |
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 7a332b3efe51..9feeb636ff9b 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -3877,7 +3877,6 @@ static struct video_device bttv_video_template = | |||
3877 | .name = "UNSET", | 3877 | .name = "UNSET", |
3878 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER| | 3878 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER| |
3879 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, | 3879 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, |
3880 | .hardware = VID_HARDWARE_BT848, | ||
3881 | .fops = &bttv_fops, | 3880 | .fops = &bttv_fops, |
3882 | .minor = -1, | 3881 | .minor = -1, |
3883 | }; | 3882 | }; |
@@ -3886,7 +3885,6 @@ static struct video_device bttv_vbi_template = | |||
3886 | { | 3885 | { |
3887 | .name = "bt848/878 vbi", | 3886 | .name = "bt848/878 vbi", |
3888 | .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, | 3887 | .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, |
3889 | .hardware = VID_HARDWARE_BT848, | ||
3890 | .fops = &bttv_fops, | 3888 | .fops = &bttv_fops, |
3891 | .minor = -1, | 3889 | .minor = -1, |
3892 | }; | 3890 | }; |
@@ -4034,7 +4032,6 @@ static struct video_device radio_template = | |||
4034 | { | 4032 | { |
4035 | .name = "bt848/878 radio", | 4033 | .name = "bt848/878 radio", |
4036 | .type = VID_TYPE_TUNER, | 4034 | .type = VID_TYPE_TUNER, |
4037 | .hardware = VID_HARDWARE_BT848, | ||
4038 | .fops = &radio_fops, | 4035 | .fops = &radio_fops, |
4039 | .minor = -1, | 4036 | .minor = -1, |
4040 | }; | 4037 | }; |
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index 7f7e3d3398d0..58423525591f 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c | |||
@@ -899,7 +899,6 @@ static struct video_device qcam_template= | |||
899 | .owner = THIS_MODULE, | 899 | .owner = THIS_MODULE, |
900 | .name = "Connectix Quickcam", | 900 | .name = "Connectix Quickcam", |
901 | .type = VID_TYPE_CAPTURE, | 901 | .type = VID_TYPE_CAPTURE, |
902 | .hardware = VID_HARDWARE_QCAM_BW, | ||
903 | .fops = &qcam_fops, | 902 | .fops = &qcam_fops, |
904 | }; | 903 | }; |
905 | 904 | ||
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index f76c6a6c3766..cf1546b5a7f1 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c | |||
@@ -699,7 +699,6 @@ static struct video_device qcam_template= | |||
699 | .owner = THIS_MODULE, | 699 | .owner = THIS_MODULE, |
700 | .name = "Colour QuickCam", | 700 | .name = "Colour QuickCam", |
701 | .type = VID_TYPE_CAPTURE, | 701 | .type = VID_TYPE_CAPTURE, |
702 | .hardware = VID_HARDWARE_QCAM_C, | ||
703 | .fops = &qcam_fops, | 702 | .fops = &qcam_fops, |
704 | }; | 703 | }; |
705 | 704 | ||
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index a1d02e5ce0fd..7c630f5ee725 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
@@ -65,10 +65,6 @@ MODULE_PARM_DESC(colorspace_conv, | |||
65 | 65 | ||
66 | #define ABOUT "V4L-Driver for Vision CPiA based cameras" | 66 | #define ABOUT "V4L-Driver for Vision CPiA based cameras" |
67 | 67 | ||
68 | #ifndef VID_HARDWARE_CPIA | ||
69 | #define VID_HARDWARE_CPIA 24 /* FIXME -> from linux/videodev.h */ | ||
70 | #endif | ||
71 | |||
72 | #define CPIA_MODULE_CPIA (0<<5) | 68 | #define CPIA_MODULE_CPIA (0<<5) |
73 | #define CPIA_MODULE_SYSTEM (1<<5) | 69 | #define CPIA_MODULE_SYSTEM (1<<5) |
74 | #define CPIA_MODULE_VP_CTRL (5<<5) | 70 | #define CPIA_MODULE_VP_CTRL (5<<5) |
@@ -3804,7 +3800,6 @@ static struct video_device cpia_template = { | |||
3804 | .owner = THIS_MODULE, | 3800 | .owner = THIS_MODULE, |
3805 | .name = "CPiA Camera", | 3801 | .name = "CPiA Camera", |
3806 | .type = VID_TYPE_CAPTURE, | 3802 | .type = VID_TYPE_CAPTURE, |
3807 | .hardware = VID_HARDWARE_CPIA, | ||
3808 | .fops = &cpia_fops, | 3803 | .fops = &cpia_fops, |
3809 | }; | 3804 | }; |
3810 | 3805 | ||
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index e3aaba1e0e0a..e378abec806d 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -86,10 +86,6 @@ MODULE_LICENSE("GPL"); | |||
86 | 86 | ||
87 | #define ABOUT "V4L-Driver for Vision CPiA2 based cameras" | 87 | #define ABOUT "V4L-Driver for Vision CPiA2 based cameras" |
88 | 88 | ||
89 | #ifndef VID_HARDWARE_CPIA2 | ||
90 | #error "VID_HARDWARE_CPIA2 should have been defined in linux/videodev.h" | ||
91 | #endif | ||
92 | |||
93 | struct control_menu_info { | 89 | struct control_menu_info { |
94 | int value; | 90 | int value; |
95 | char name[32]; | 91 | char name[32]; |
@@ -1942,7 +1938,6 @@ static struct video_device cpia2_template = { | |||
1942 | .type= VID_TYPE_CAPTURE, | 1938 | .type= VID_TYPE_CAPTURE, |
1943 | .type2 = V4L2_CAP_VIDEO_CAPTURE | | 1939 | .type2 = V4L2_CAP_VIDEO_CAPTURE | |
1944 | V4L2_CAP_STREAMING, | 1940 | V4L2_CAP_STREAMING, |
1945 | .hardware= VID_HARDWARE_CPIA2, | ||
1946 | .minor= -1, | 1941 | .minor= -1, |
1947 | .fops= &fops_template, | 1942 | .fops= &fops_template, |
1948 | .release= video_device_release, | 1943 | .release= video_device_release, |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 231ae6c4dd22..5ee05f8f3fad 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1675,7 +1675,6 @@ static struct video_device cx8800_radio_template = | |||
1675 | { | 1675 | { |
1676 | .name = "cx8800-radio", | 1676 | .name = "cx8800-radio", |
1677 | .type = VID_TYPE_TUNER, | 1677 | .type = VID_TYPE_TUNER, |
1678 | .hardware = 0, | ||
1679 | .fops = &radio_fops, | 1678 | .fops = &radio_fops, |
1680 | .minor = -1, | 1679 | .minor = -1, |
1681 | .vidioc_querycap = radio_querycap, | 1680 | .vidioc_querycap = radio_querycap, |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index e467682aabd7..a4c2a907124a 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1617,7 +1617,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
1617 | 1617 | ||
1618 | /* Fills VBI device info */ | 1618 | /* Fills VBI device info */ |
1619 | dev->vbi_dev->type = VFL_TYPE_VBI; | 1619 | dev->vbi_dev->type = VFL_TYPE_VBI; |
1620 | dev->vbi_dev->hardware = 0; | ||
1621 | dev->vbi_dev->fops = &em28xx_v4l_fops; | 1620 | dev->vbi_dev->fops = &em28xx_v4l_fops; |
1622 | dev->vbi_dev->minor = -1; | 1621 | dev->vbi_dev->minor = -1; |
1623 | dev->vbi_dev->dev = &dev->udev->dev; | 1622 | dev->vbi_dev->dev = &dev->udev->dev; |
@@ -1629,7 +1628,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
1629 | dev->vdev->type = VID_TYPE_CAPTURE; | 1628 | dev->vdev->type = VID_TYPE_CAPTURE; |
1630 | if (dev->has_tuner) | 1629 | if (dev->has_tuner) |
1631 | dev->vdev->type |= VID_TYPE_TUNER; | 1630 | dev->vdev->type |= VID_TYPE_TUNER; |
1632 | dev->vdev->hardware = 0; | ||
1633 | dev->vdev->fops = &em28xx_v4l_fops; | 1631 | dev->vdev->fops = &em28xx_v4l_fops; |
1634 | dev->vdev->minor = -1; | 1632 | dev->vdev->minor = -1; |
1635 | dev->vdev->dev = &dev->udev->dev; | 1633 | dev->vdev->dev = &dev->udev->dev; |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index d5fef4c01c87..d19d73b81ede 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 | strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); | 2585 | strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); |
2586 | cam->v4ldev->owner = THIS_MODULE; | 2586 | cam->v4ldev->owner = THIS_MODULE; |
2587 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 2587 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
2588 | cam->v4ldev->hardware = 0; | ||
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/meye.c b/drivers/media/video/meye.c index 69283926a8dc..c31163290432 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1762,7 +1762,6 @@ static struct video_device meye_template = { | |||
1762 | .owner = THIS_MODULE, | 1762 | .owner = THIS_MODULE, |
1763 | .name = "meye", | 1763 | .name = "meye", |
1764 | .type = VID_TYPE_CAPTURE, | 1764 | .type = VID_TYPE_CAPTURE, |
1765 | .hardware = VID_HARDWARE_MEYE, | ||
1766 | .fops = &meye_fops, | 1765 | .fops = &meye_fops, |
1767 | .release = video_device_release, | 1766 | .release = video_device_release, |
1768 | .minor = -1, | 1767 | .minor = -1, |
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index b8d4ac0d938e..d55d5800efb4 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
@@ -4668,7 +4668,6 @@ static struct video_device vdev_template = { | |||
4668 | .owner = THIS_MODULE, | 4668 | .owner = THIS_MODULE, |
4669 | .name = "OV511 USB Camera", | 4669 | .name = "OV511 USB Camera", |
4670 | .type = VID_TYPE_CAPTURE, | 4670 | .type = VID_TYPE_CAPTURE, |
4671 | .hardware = VID_HARDWARE_OV511, | ||
4672 | .fops = &ov511_fops, | 4671 | .fops = &ov511_fops, |
4673 | .release = video_device_release, | 4672 | .release = video_device_release, |
4674 | .minor = -1, | 4673 | .minor = -1, |
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c index 0ef73d9d5848..ce4b2f9791ee 100644 --- a/drivers/media/video/planb.c +++ b/drivers/media/video/planb.c | |||
@@ -2013,7 +2013,6 @@ static struct video_device planb_template= | |||
2013 | .owner = THIS_MODULE, | 2013 | .owner = THIS_MODULE, |
2014 | .name = PLANB_DEVICE_NAME, | 2014 | .name = PLANB_DEVICE_NAME, |
2015 | .type = VID_TYPE_OVERLAY, | 2015 | .type = VID_TYPE_OVERLAY, |
2016 | .hardware = VID_HARDWARE_PLANB, | ||
2017 | .open = planb_open, | 2016 | .open = planb_open, |
2018 | .close = planb_close, | 2017 | .close = planb_close, |
2019 | .read = planb_read, | 2018 | .read = planb_read, |
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index b5a67f0dd19f..6820c2aabd30 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c | |||
@@ -895,7 +895,6 @@ static struct video_device pms_template= | |||
895 | .owner = THIS_MODULE, | 895 | .owner = THIS_MODULE, |
896 | .name = "Mediavision PMS", | 896 | .name = "Mediavision PMS", |
897 | .type = VID_TYPE_CAPTURE, | 897 | .type = VID_TYPE_CAPTURE, |
898 | .hardware = VID_HARDWARE_PMS, | ||
899 | .fops = &pms_fops, | 898 | .fops = &pms_fops, |
900 | }; | 899 | }; |
901 | 900 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 4563b3df8a0d..7a596ea7cfe6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -1121,15 +1121,12 @@ static const struct file_operations vdev_fops = { | |||
1121 | }; | 1121 | }; |
1122 | 1122 | ||
1123 | 1123 | ||
1124 | #define VID_HARDWARE_PVRUSB2 38 /* FIXME : need a good value */ | ||
1125 | |||
1126 | static struct video_device vdev_template = { | 1124 | static struct video_device vdev_template = { |
1127 | .owner = THIS_MODULE, | 1125 | .owner = THIS_MODULE, |
1128 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, | 1126 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, |
1129 | .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE | 1127 | .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |
1130 | | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | 1128 | | V4L2_CAP_TUNER | V4L2_CAP_AUDIO |
1131 | | V4L2_CAP_READWRITE), | 1129 | | V4L2_CAP_READWRITE), |
1132 | .hardware = VID_HARDWARE_PVRUSB2, | ||
1133 | .fops = &vdev_fops, | 1130 | .fops = &vdev_fops, |
1134 | }; | 1131 | }; |
1135 | 1132 | ||
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 950da2542148..7300ace8f44e 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -166,7 +166,6 @@ static struct video_device pwc_template = { | |||
166 | .owner = THIS_MODULE, | 166 | .owner = THIS_MODULE, |
167 | .name = "Philips Webcam", /* Filled in later */ | 167 | .name = "Philips Webcam", /* Filled in later */ |
168 | .type = VID_TYPE_CAPTURE, | 168 | .type = VID_TYPE_CAPTURE, |
169 | .hardware = VID_HARDWARE_PWC, | ||
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/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 34ca874dd7fe..0a7d94319685 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -342,7 +342,6 @@ static struct video_device saa7134_empress_template = | |||
342 | .name = "saa7134-empress", | 342 | .name = "saa7134-empress", |
343 | .type = 0 /* FIXME */, | 343 | .type = 0 /* FIXME */, |
344 | .type2 = 0 /* FIXME */, | 344 | .type2 = 0 /* FIXME */, |
345 | .hardware = 0, | ||
346 | .fops = &ts_fops, | 345 | .fops = &ts_fops, |
347 | .minor = -1, | 346 | .minor = -1, |
348 | }; | 347 | }; |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 471b92793c12..2b0897770531 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -2352,7 +2352,6 @@ struct video_device saa7134_video_template = | |||
2352 | .name = "saa7134-video", | 2352 | .name = "saa7134-video", |
2353 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER| | 2353 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER| |
2354 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, | 2354 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, |
2355 | .hardware = 0, | ||
2356 | .fops = &video_fops, | 2355 | .fops = &video_fops, |
2357 | .minor = -1, | 2356 | .minor = -1, |
2358 | }; | 2357 | }; |
@@ -2361,7 +2360,6 @@ struct video_device saa7134_vbi_template = | |||
2361 | { | 2360 | { |
2362 | .name = "saa7134-vbi", | 2361 | .name = "saa7134-vbi", |
2363 | .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, | 2362 | .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, |
2364 | .hardware = 0, | ||
2365 | .fops = &video_fops, | 2363 | .fops = &video_fops, |
2366 | .minor = -1, | 2364 | .minor = -1, |
2367 | }; | 2365 | }; |
@@ -2370,7 +2368,6 @@ struct video_device saa7134_radio_template = | |||
2370 | { | 2368 | { |
2371 | .name = "saa7134-radio", | 2369 | .name = "saa7134-radio", |
2372 | .type = VID_TYPE_TUNER, | 2370 | .type = VID_TYPE_TUNER, |
2373 | .hardware = 0, | ||
2374 | .fops = &radio_fops, | 2371 | .fops = &radio_fops, |
2375 | .minor = -1, | 2372 | .minor = -1, |
2376 | }; | 2373 | }; |
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index 93fb04ed99a0..d5d7d6cf734a 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
@@ -1231,7 +1231,6 @@ static struct video_device se401_template = { | |||
1231 | .owner = THIS_MODULE, | 1231 | .owner = THIS_MODULE, |
1232 | .name = "se401 USB camera", | 1232 | .name = "se401 USB camera", |
1233 | .type = VID_TYPE_CAPTURE, | 1233 | .type = VID_TYPE_CAPTURE, |
1234 | .hardware = VID_HARDWARE_SE401, | ||
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 6991e06f7651..511847912c48 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -3319,7 +3319,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3319 | strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); | 3319 | strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); |
3320 | cam->v4ldev->owner = THIS_MODULE; | 3320 | cam->v4ldev->owner = THIS_MODULE; |
3321 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 3321 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
3322 | cam->v4ldev->hardware = 0; | ||
3323 | cam->v4ldev->fops = &sn9c102_fops; | 3322 | cam->v4ldev->fops = &sn9c102_fops; |
3324 | cam->v4ldev->minor = video_nr[dev_nr]; | 3323 | cam->v4ldev->minor = video_nr[dev_nr]; |
3325 | cam->v4ldev->release = video_device_release; | 3324 | cam->v4ldev->release = video_device_release; |
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index eb220461ac77..3fb85af5d1f2 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -1917,7 +1917,6 @@ static const struct file_operations saa_fops = { | |||
1917 | static struct video_device saa_template = { | 1917 | static struct video_device saa_template = { |
1918 | .name = "SAA7146A", | 1918 | .name = "SAA7146A", |
1919 | .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY, | 1919 | .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY, |
1920 | .hardware = VID_HARDWARE_SAA7146, | ||
1921 | .fops = &saa_fops, | 1920 | .fops = &saa_fops, |
1922 | .minor = -1, | 1921 | .minor = -1, |
1923 | }; | 1922 | }; |
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 9e009a7ab863..afc32aa56fde 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
@@ -1398,7 +1398,6 @@ static struct video_device stv680_template = { | |||
1398 | .owner = THIS_MODULE, | 1398 | .owner = THIS_MODULE, |
1399 | .name = "STV0680 USB camera", | 1399 | .name = "STV0680 USB camera", |
1400 | .type = VID_TYPE_CAPTURE, | 1400 | .type = VID_TYPE_CAPTURE, |
1401 | .hardware = VID_HARDWARE_SE401, | ||
1402 | .fops = &stv680_fops, | 1401 | .fops = &stv680_fops, |
1403 | .release = video_device_release, | 1402 | .release = video_device_release, |
1404 | .minor = -1, | 1403 | .minor = -1, |
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 37ce36b9e587..fb434b5602a3 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 | static const struct video_device usbvideo_template = { | 952 | static const struct video_device usbvideo_template = { |
953 | .owner = THIS_MODULE, | 953 | .owner = THIS_MODULE, |
954 | .type = VID_TYPE_CAPTURE, | 954 | .type = VID_TYPE_CAPTURE, |
955 | .hardware = VID_HARDWARE_CPIA, | ||
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 db3c9e3deb26..da1ba0211108 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -1074,7 +1074,6 @@ static struct video_device vicam_template = { | |||
1074 | .owner = THIS_MODULE, | 1074 | .owner = THIS_MODULE, |
1075 | .name = "ViCam-based USB Camera", | 1075 | .name = "ViCam-based USB Camera", |
1076 | .type = VID_TYPE_CAPTURE, | 1076 | .type = VID_TYPE_CAPTURE, |
1077 | .hardware = VID_HARDWARE_VICAM, | ||
1078 | .fops = &vicam_fops, | 1077 | .fops = &vicam_fops, |
1079 | .minor = -1, | 1078 | .minor = -1, |
1080 | }; | 1079 | }; |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index e2f3c01cfa13..36e689fa16c0 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -1400,7 +1400,6 @@ static const struct file_operations usbvision_fops = { | |||
1400 | static struct video_device usbvision_video_template = { | 1400 | static struct video_device usbvision_video_template = { |
1401 | .owner = THIS_MODULE, | 1401 | .owner = THIS_MODULE, |
1402 | .type = VID_TYPE_TUNER | VID_TYPE_CAPTURE, | 1402 | .type = VID_TYPE_TUNER | VID_TYPE_CAPTURE, |
1403 | .hardware = VID_HARDWARE_USBVISION, | ||
1404 | .fops = &usbvision_fops, | 1403 | .fops = &usbvision_fops, |
1405 | .name = "usbvision-video", | 1404 | .name = "usbvision-video", |
1406 | .release = video_device_release, | 1405 | .release = video_device_release, |
@@ -1455,7 +1454,6 @@ static struct video_device usbvision_radio_template= | |||
1455 | { | 1454 | { |
1456 | .owner = THIS_MODULE, | 1455 | .owner = THIS_MODULE, |
1457 | .type = VID_TYPE_TUNER, | 1456 | .type = VID_TYPE_TUNER, |
1458 | .hardware = VID_HARDWARE_USBVISION, | ||
1459 | .fops = &usbvision_radio_fops, | 1457 | .fops = &usbvision_radio_fops, |
1460 | .name = "usbvision-radio", | 1458 | .name = "usbvision-radio", |
1461 | .release = video_device_release, | 1459 | .release = video_device_release, |
@@ -1492,7 +1490,6 @@ static struct video_device usbvision_vbi_template= | |||
1492 | { | 1490 | { |
1493 | .owner = THIS_MODULE, | 1491 | .owner = THIS_MODULE, |
1494 | .type = VID_TYPE_TUNER, | 1492 | .type = VID_TYPE_TUNER, |
1495 | .hardware = VID_HARDWARE_USBVISION, | ||
1496 | .fops = &usbvision_vbi_fops, | 1493 | .fops = &usbvision_vbi_fops, |
1497 | .release = video_device_release, | 1494 | .release = video_device_release, |
1498 | .name = "usbvision-vbi", | 1495 | .name = "usbvision-vbi", |
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c index f2bbd7a4d562..87951ec8254f 100644 --- a/drivers/media/video/videocodec.c +++ b/drivers/media/video/videocodec.c | |||
@@ -86,8 +86,8 @@ videocodec_attach (struct videocodec_master *master) | |||
86 | } | 86 | } |
87 | 87 | ||
88 | dprintk(2, | 88 | dprintk(2, |
89 | "videocodec_attach: '%s', type: %x, flags %lx, magic %lx\n", | 89 | "videocodec_attach: '%s', flags %lx, magic %lx\n", |
90 | master->name, master->type, master->flags, master->magic); | 90 | master->name, master->flags, master->magic); |
91 | 91 | ||
92 | if (!h) { | 92 | if (!h) { |
93 | dprintk(1, | 93 | dprintk(1, |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index b532aa280a1b..ee73dc75131c 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -1119,7 +1119,6 @@ static const struct file_operations vivi_fops = { | |||
1119 | static struct video_device vivi = { | 1119 | static struct video_device vivi = { |
1120 | .name = "vivi", | 1120 | .name = "vivi", |
1121 | .type = VID_TYPE_CAPTURE, | 1121 | .type = VID_TYPE_CAPTURE, |
1122 | .hardware = 0, | ||
1123 | .fops = &vivi_fops, | 1122 | .fops = &vivi_fops, |
1124 | .minor = -1, | 1123 | .minor = -1, |
1125 | // .release = video_device_release, | 1124 | // .release = video_device_release, |
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 47366408637c..08aaae07c7e0 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
@@ -196,7 +196,6 @@ static struct video_device w9966_template = { | |||
196 | .owner = THIS_MODULE, | 196 | .owner = THIS_MODULE, |
197 | .name = W9966_DRIVERNAME, | 197 | .name = W9966_DRIVERNAME, |
198 | .type = VID_TYPE_CAPTURE | VID_TYPE_SCALES, | 198 | .type = VID_TYPE_CAPTURE | VID_TYPE_SCALES, |
199 | .hardware = VID_HARDWARE_W9966, | ||
200 | .fops = &w9966_fops, | 199 | .fops = &w9966_fops, |
201 | }; | 200 | }; |
202 | 201 | ||
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 9e7f3e685d73..2ae1430f5f7d 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -3549,7 +3549,6 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3549 | strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); | 3549 | strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); |
3550 | cam->v4ldev->owner = THIS_MODULE; | 3550 | cam->v4ldev->owner = THIS_MODULE; |
3551 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 3551 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
3552 | cam->v4ldev->hardware = VID_HARDWARE_W9968CF; | ||
3553 | cam->v4ldev->fops = &w9968cf_fops; | 3552 | cam->v4ldev->fops = &w9968cf_fops; |
3554 | cam->v4ldev->minor = video_nr[dev_nr]; | 3553 | cam->v4ldev->minor = video_nr[dev_nr]; |
3555 | cam->v4ldev->release = video_device_release; | 3554 | 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 08a93c31c0a0..2c5665c82442 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 | strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); | 1985 | strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); |
1986 | cam->v4ldev->owner = THIS_MODULE; | 1986 | cam->v4ldev->owner = THIS_MODULE; |
1987 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 1987 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
1988 | cam->v4ldev->hardware = 0; | ||
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_card.c b/drivers/media/video/zoran_card.c index 48da36a15fca..6e0ac4c5c379 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c | |||
@@ -1235,8 +1235,14 @@ zoran_setup_videocodec (struct zoran *zr, | |||
1235 | return m; | 1235 | return m; |
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | m->magic = 0L; /* magic not used */ | 1238 | /* magic and type are unused for master struct. Makes sense only at |
1239 | m->type = VID_HARDWARE_ZR36067; | 1239 | codec structs. |
1240 | In the past, .type were initialized to the old V4L1 .hardware | ||
1241 | value, as VID_HARDWARE_ZR36067 | ||
1242 | */ | ||
1243 | m->magic = 0L; | ||
1244 | m->type = 0; | ||
1245 | |||
1240 | m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER; | 1246 | m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER; |
1241 | strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name)); | 1247 | strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name)); |
1242 | m->data = zr; | 1248 | m->data = zr; |
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index 419e5af78533..dd3d7d2c8b0e 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
@@ -60,7 +60,6 @@ | |||
60 | 60 | ||
61 | #include <linux/spinlock.h> | 61 | #include <linux/spinlock.h> |
62 | #define MAP_NR(x) virt_to_page(x) | 62 | #define MAP_NR(x) virt_to_page(x) |
63 | #define ZORAN_HARDWARE VID_HARDWARE_ZR36067 | ||
64 | #define ZORAN_VID_TYPE ( \ | 63 | #define ZORAN_VID_TYPE ( \ |
65 | VID_TYPE_CAPTURE | \ | 64 | VID_TYPE_CAPTURE | \ |
66 | VID_TYPE_OVERLAY | \ | 65 | VID_TYPE_OVERLAY | \ |
@@ -4659,7 +4658,6 @@ struct video_device zoran_template __devinitdata = { | |||
4659 | #ifdef CONFIG_VIDEO_V4L2 | 4658 | #ifdef CONFIG_VIDEO_V4L2 |
4660 | .type2 = ZORAN_V4L2_VID_FLAGS, | 4659 | .type2 = ZORAN_V4L2_VID_FLAGS, |
4661 | #endif | 4660 | #endif |
4662 | .hardware = ZORAN_HARDWARE, | ||
4663 | .fops = &zoran_fops, | 4661 | .fops = &zoran_fops, |
4664 | .release = &zoran_vdev_release, | 4662 | .release = &zoran_vdev_release, |
4665 | .minor = -1 | 4663 | .minor = -1 |