tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (6320): v4l core: remove the unused .hardware V4L1 field

struct video_device used to define a .hardware field. While
initialized on severl drivers, this field is never used inside V4L.
However, drivers using it need to include the old V4L1 header.

This seems to cause compilation troubles with some random configs.
Better just to remove it from all drivers.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Mauro Carvalho Chehab 22c4a4e9 786e9d4c

+10 -96
-1
drivers/media/radio/miropcm20-radio.c
··· 229 229 .owner = THIS_MODULE, 230 230 .name = "Miro PCM 20 radio", 231 231 .type = VID_TYPE_TUNER, 232 - .hardware = VID_HARDWARE_RTRACK, 233 232 .fops = &pcm20_fops, 234 233 .priv = &pcm20_unit 235 234 };
-1
drivers/media/video/arv.c
··· 755 755 .owner = THIS_MODULE, 756 756 .name = "Colour AR VGA", 757 757 .type = VID_TYPE_CAPTURE, 758 - .hardware = VID_HARDWARE_ARV, 759 758 .fops = &ar_fops, 760 759 .release = ar_release, 761 760 .minor = -1,
-3
drivers/media/video/bt8xx/bttv-driver.c
··· 3877 3877 .name = "UNSET", 3878 3878 .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER| 3879 3879 VID_TYPE_CLIPPING|VID_TYPE_SCALES, 3880 - .hardware = VID_HARDWARE_BT848, 3881 3880 .fops = &bttv_fops, 3882 3881 .minor = -1, 3883 3882 }; ··· 3885 3886 { 3886 3887 .name = "bt848/878 vbi", 3887 3888 .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, 3888 - .hardware = VID_HARDWARE_BT848, 3889 3889 .fops = &bttv_fops, 3890 3890 .minor = -1, 3891 3891 }; ··· 4032 4034 { 4033 4035 .name = "bt848/878 radio", 4034 4036 .type = VID_TYPE_TUNER, 4035 - .hardware = VID_HARDWARE_BT848, 4036 4037 .fops = &radio_fops, 4037 4038 .minor = -1, 4038 4039 };
-1
drivers/media/video/bw-qcam.c
··· 899 899 .owner = THIS_MODULE, 900 900 .name = "Connectix Quickcam", 901 901 .type = VID_TYPE_CAPTURE, 902 - .hardware = VID_HARDWARE_QCAM_BW, 903 902 .fops = &qcam_fops, 904 903 }; 905 904
-1
drivers/media/video/c-qcam.c
··· 699 699 .owner = THIS_MODULE, 700 700 .name = "Colour QuickCam", 701 701 .type = VID_TYPE_CAPTURE, 702 - .hardware = VID_HARDWARE_QCAM_C, 703 702 .fops = &qcam_fops, 704 703 }; 705 704
-5
drivers/media/video/cpia.c
··· 65 65 66 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 68 #define CPIA_MODULE_CPIA (0<<5) 73 69 #define CPIA_MODULE_SYSTEM (1<<5) 74 70 #define CPIA_MODULE_VP_CTRL (5<<5) ··· 3800 3804 .owner = THIS_MODULE, 3801 3805 .name = "CPiA Camera", 3802 3806 .type = VID_TYPE_CAPTURE, 3803 - .hardware = VID_HARDWARE_CPIA, 3804 3807 .fops = &cpia_fops, 3805 3808 }; 3806 3809
-5
drivers/media/video/cpia2/cpia2_v4l.c
··· 86 86 87 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 89 struct control_menu_info { 94 90 int value; 95 91 char name[32]; ··· 1938 1942 .type= VID_TYPE_CAPTURE, 1939 1943 .type2 = V4L2_CAP_VIDEO_CAPTURE | 1940 1944 V4L2_CAP_STREAMING, 1941 - .hardware= VID_HARDWARE_CPIA2, 1942 1945 .minor= -1, 1943 1946 .fops= &fops_template, 1944 1947 .release= video_device_release,
-1
drivers/media/video/cx88/cx88-video.c
··· 1675 1675 { 1676 1676 .name = "cx8800-radio", 1677 1677 .type = VID_TYPE_TUNER, 1678 - .hardware = 0, 1679 1678 .fops = &radio_fops, 1680 1679 .minor = -1, 1681 1680 .vidioc_querycap = radio_querycap,
-2
drivers/media/video/em28xx/em28xx-video.c
··· 1617 1617 1618 1618 /* Fills VBI device info */ 1619 1619 dev->vbi_dev->type = VFL_TYPE_VBI; 1620 - dev->vbi_dev->hardware = 0; 1621 1620 dev->vbi_dev->fops = &em28xx_v4l_fops; 1622 1621 dev->vbi_dev->minor = -1; 1623 1622 dev->vbi_dev->dev = &dev->udev->dev; ··· 1628 1629 dev->vdev->type = VID_TYPE_CAPTURE; 1629 1630 if (dev->has_tuner) 1630 1631 dev->vdev->type |= VID_TYPE_TUNER; 1631 - dev->vdev->hardware = 0; 1632 1632 dev->vdev->fops = &em28xx_v4l_fops; 1633 1633 dev->vdev->minor = -1; 1634 1634 dev->vdev->dev = &dev->udev->dev;
-1
drivers/media/video/et61x251/et61x251_core.c
··· 2585 2585 strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); 2586 2586 cam->v4ldev->owner = THIS_MODULE; 2587 2587 cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; 2588 - cam->v4ldev->hardware = 0; 2589 2588 cam->v4ldev->fops = &et61x251_fops; 2590 2589 cam->v4ldev->minor = video_nr[dev_nr]; 2591 2590 cam->v4ldev->release = video_device_release;
-1
drivers/media/video/meye.c
··· 1762 1762 .owner = THIS_MODULE, 1763 1763 .name = "meye", 1764 1764 .type = VID_TYPE_CAPTURE, 1765 - .hardware = VID_HARDWARE_MEYE, 1766 1765 .fops = &meye_fops, 1767 1766 .release = video_device_release, 1768 1767 .minor = -1,
-1
drivers/media/video/ov511.c
··· 4668 4668 .owner = THIS_MODULE, 4669 4669 .name = "OV511 USB Camera", 4670 4670 .type = VID_TYPE_CAPTURE, 4671 - .hardware = VID_HARDWARE_OV511, 4672 4671 .fops = &ov511_fops, 4673 4672 .release = video_device_release, 4674 4673 .minor = -1,
-1
drivers/media/video/planb.c
··· 2013 2013 .owner = THIS_MODULE, 2014 2014 .name = PLANB_DEVICE_NAME, 2015 2015 .type = VID_TYPE_OVERLAY, 2016 - .hardware = VID_HARDWARE_PLANB, 2017 2016 .open = planb_open, 2018 2017 .close = planb_close, 2019 2018 .read = planb_read,
-1
drivers/media/video/pms.c
··· 895 895 .owner = THIS_MODULE, 896 896 .name = "Mediavision PMS", 897 897 .type = VID_TYPE_CAPTURE, 898 - .hardware = VID_HARDWARE_PMS, 899 898 .fops = &pms_fops, 900 899 }; 901 900
-3
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
··· 1121 1121 }; 1122 1122 1123 1123 1124 - #define VID_HARDWARE_PVRUSB2 38 /* FIXME : need a good value */ 1125 - 1126 1124 static struct video_device vdev_template = { 1127 1125 .owner = THIS_MODULE, 1128 1126 .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, 1129 1127 .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE 1130 1128 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO 1131 1129 | V4L2_CAP_READWRITE), 1132 - .hardware = VID_HARDWARE_PVRUSB2, 1133 1130 .fops = &vdev_fops, 1134 1131 }; 1135 1132
-1
drivers/media/video/pwc/pwc-if.c
··· 166 166 .owner = THIS_MODULE, 167 167 .name = "Philips Webcam", /* Filled in later */ 168 168 .type = VID_TYPE_CAPTURE, 169 - .hardware = VID_HARDWARE_PWC, 170 169 .release = video_device_release, 171 170 .fops = &pwc_fops, 172 171 .minor = -1,
-1
drivers/media/video/saa7134/saa7134-empress.c
··· 342 342 .name = "saa7134-empress", 343 343 .type = 0 /* FIXME */, 344 344 .type2 = 0 /* FIXME */, 345 - .hardware = 0, 346 345 .fops = &ts_fops, 347 346 .minor = -1, 348 347 };
-3
drivers/media/video/saa7134/saa7134-video.c
··· 2352 2352 .name = "saa7134-video", 2353 2353 .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER| 2354 2354 VID_TYPE_CLIPPING|VID_TYPE_SCALES, 2355 - .hardware = 0, 2356 2355 .fops = &video_fops, 2357 2356 .minor = -1, 2358 2357 }; ··· 2360 2361 { 2361 2362 .name = "saa7134-vbi", 2362 2363 .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, 2363 - .hardware = 0, 2364 2364 .fops = &video_fops, 2365 2365 .minor = -1, 2366 2366 }; ··· 2368 2370 { 2369 2371 .name = "saa7134-radio", 2370 2372 .type = VID_TYPE_TUNER, 2371 - .hardware = 0, 2372 2373 .fops = &radio_fops, 2373 2374 .minor = -1, 2374 2375 };
-1
drivers/media/video/se401.c
··· 1231 1231 .owner = THIS_MODULE, 1232 1232 .name = "se401 USB camera", 1233 1233 .type = VID_TYPE_CAPTURE, 1234 - .hardware = VID_HARDWARE_SE401, 1235 1234 .fops = &se401_fops, 1236 1235 }; 1237 1236
-1
drivers/media/video/sn9c102/sn9c102_core.c
··· 3319 3319 strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); 3320 3320 cam->v4ldev->owner = THIS_MODULE; 3321 3321 cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; 3322 - cam->v4ldev->hardware = 0; 3323 3322 cam->v4ldev->fops = &sn9c102_fops; 3324 3323 cam->v4ldev->minor = video_nr[dev_nr]; 3325 3324 cam->v4ldev->release = video_device_release;
-1
drivers/media/video/stradis.c
··· 1917 1917 static struct video_device saa_template = { 1918 1918 .name = "SAA7146A", 1919 1919 .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY, 1920 - .hardware = VID_HARDWARE_SAA7146, 1921 1920 .fops = &saa_fops, 1922 1921 .minor = -1, 1923 1922 };
-1
drivers/media/video/stv680.c
··· 1398 1398 .owner = THIS_MODULE, 1399 1399 .name = "STV0680 USB camera", 1400 1400 .type = VID_TYPE_CAPTURE, 1401 - .hardware = VID_HARDWARE_SE401, 1402 1401 .fops = &stv680_fops, 1403 1402 .release = video_device_release, 1404 1403 .minor = -1,
-1
drivers/media/video/usbvideo/usbvideo.c
··· 952 952 static const struct video_device usbvideo_template = { 953 953 .owner = THIS_MODULE, 954 954 .type = VID_TYPE_CAPTURE, 955 - .hardware = VID_HARDWARE_CPIA, 956 955 .fops = &usbvideo_fops, 957 956 }; 958 957
-1
drivers/media/video/usbvideo/vicam.c
··· 1074 1074 .owner = THIS_MODULE, 1075 1075 .name = "ViCam-based USB Camera", 1076 1076 .type = VID_TYPE_CAPTURE, 1077 - .hardware = VID_HARDWARE_VICAM, 1078 1077 .fops = &vicam_fops, 1079 1078 .minor = -1, 1080 1079 };
-3
drivers/media/video/usbvision/usbvision-video.c
··· 1400 1400 static struct video_device usbvision_video_template = { 1401 1401 .owner = THIS_MODULE, 1402 1402 .type = VID_TYPE_TUNER | VID_TYPE_CAPTURE, 1403 - .hardware = VID_HARDWARE_USBVISION, 1404 1403 .fops = &usbvision_fops, 1405 1404 .name = "usbvision-video", 1406 1405 .release = video_device_release, ··· 1454 1455 { 1455 1456 .owner = THIS_MODULE, 1456 1457 .type = VID_TYPE_TUNER, 1457 - .hardware = VID_HARDWARE_USBVISION, 1458 1458 .fops = &usbvision_radio_fops, 1459 1459 .name = "usbvision-radio", 1460 1460 .release = video_device_release, ··· 1490 1492 { 1491 1493 .owner = THIS_MODULE, 1492 1494 .type = VID_TYPE_TUNER, 1493 - .hardware = VID_HARDWARE_USBVISION, 1494 1495 .fops = &usbvision_vbi_fops, 1495 1496 .release = video_device_release, 1496 1497 .name = "usbvision-vbi",
+2 -2
drivers/media/video/videocodec.c
··· 86 86 } 87 87 88 88 dprintk(2, 89 - "videocodec_attach: '%s', type: %x, flags %lx, magic %lx\n", 90 - master->name, master->type, master->flags, master->magic); 89 + "videocodec_attach: '%s', flags %lx, magic %lx\n", 90 + master->name, master->flags, master->magic); 91 91 92 92 if (!h) { 93 93 dprintk(1,
-1
drivers/media/video/vivi.c
··· 1119 1119 static struct video_device vivi = { 1120 1120 .name = "vivi", 1121 1121 .type = VID_TYPE_CAPTURE, 1122 - .hardware = 0, 1123 1122 .fops = &vivi_fops, 1124 1123 .minor = -1, 1125 1124 // .release = video_device_release,
-1
drivers/media/video/w9966.c
··· 196 196 .owner = THIS_MODULE, 197 197 .name = W9966_DRIVERNAME, 198 198 .type = VID_TYPE_CAPTURE | VID_TYPE_SCALES, 199 - .hardware = VID_HARDWARE_W9966, 200 199 .fops = &w9966_fops, 201 200 }; 202 201
-1
drivers/media/video/w9968cf.c
··· 3549 3549 strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); 3550 3550 cam->v4ldev->owner = THIS_MODULE; 3551 3551 cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; 3552 - cam->v4ldev->hardware = VID_HARDWARE_W9968CF; 3553 3552 cam->v4ldev->fops = &w9968cf_fops; 3554 3553 cam->v4ldev->minor = video_nr[dev_nr]; 3555 3554 cam->v4ldev->release = video_device_release;
-1
drivers/media/video/zc0301/zc0301_core.c
··· 1985 1985 strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); 1986 1986 cam->v4ldev->owner = THIS_MODULE; 1987 1987 cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; 1988 - cam->v4ldev->hardware = 0; 1989 1988 cam->v4ldev->fops = &zc0301_fops; 1990 1989 cam->v4ldev->minor = video_nr[dev_nr]; 1991 1990 cam->v4ldev->release = video_device_release;
+8 -2
drivers/media/video/zoran_card.c
··· 1235 1235 return m; 1236 1236 } 1237 1237 1238 - m->magic = 0L; /* magic not used */ 1239 - m->type = VID_HARDWARE_ZR36067; 1238 + /* magic and type are unused for master struct. Makes sense only at 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 1246 m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER; 1241 1247 strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name)); 1242 1248 m->data = zr;
-2
drivers/media/video/zoran_driver.c
··· 60 60 61 61 #include <linux/spinlock.h> 62 62 #define MAP_NR(x) virt_to_page(x) 63 - #define ZORAN_HARDWARE VID_HARDWARE_ZR36067 64 63 #define ZORAN_VID_TYPE ( \ 65 64 VID_TYPE_CAPTURE | \ 66 65 VID_TYPE_OVERLAY | \ ··· 4658 4659 #ifdef CONFIG_VIDEO_V4L2 4659 4660 .type2 = ZORAN_V4L2_VID_FLAGS, 4660 4661 #endif 4661 - .hardware = ZORAN_HARDWARE, 4662 4662 .fops = &zoran_fops, 4663 4663 .release = &zoran_vdev_release, 4664 4664 .minor = -1
-42
include/linux/videodev.h
··· 294 294 #define VID_PLAY_RESET 13 295 295 #define VID_PLAY_END_MARK 14 296 296 297 - 298 - 299 - #define VID_HARDWARE_BT848 1 300 - #define VID_HARDWARE_QCAM_BW 2 301 - #define VID_HARDWARE_PMS 3 302 - #define VID_HARDWARE_QCAM_C 4 303 - #define VID_HARDWARE_PSEUDO 5 304 - #define VID_HARDWARE_SAA5249 6 305 - #define VID_HARDWARE_AZTECH 7 306 - #define VID_HARDWARE_SF16MI 8 307 - #define VID_HARDWARE_RTRACK 9 308 - #define VID_HARDWARE_ZOLTRIX 10 309 - #define VID_HARDWARE_SAA7146 11 310 - #define VID_HARDWARE_VIDEUM 12 /* Reserved for Winnov videum */ 311 - #define VID_HARDWARE_RTRACK2 13 312 - #define VID_HARDWARE_PERMEDIA2 14 /* Reserved for Permedia2 */ 313 - #define VID_HARDWARE_RIVA128 15 /* Reserved for RIVA 128 */ 314 - #define VID_HARDWARE_PLANB 16 /* PowerMac motherboard video-in */ 315 - #define VID_HARDWARE_BROADWAY 17 /* Broadway project */ 316 - #define VID_HARDWARE_GEMTEK 18 317 - #define VID_HARDWARE_TYPHOON 19 318 - #define VID_HARDWARE_VINO 20 /* SGI Indy Vino */ 319 - #define VID_HARDWARE_CADET 21 /* Cadet radio */ 320 - #define VID_HARDWARE_TRUST 22 /* Trust FM Radio */ 321 - #define VID_HARDWARE_TERRATEC 23 /* TerraTec ActiveRadio */ 322 - #define VID_HARDWARE_CPIA 24 323 - #define VID_HARDWARE_ZR36120 25 /* Zoran ZR36120/ZR36125 */ 324 - #define VID_HARDWARE_ZR36067 26 /* Zoran ZR36067/36060 */ 325 - #define VID_HARDWARE_OV511 27 326 - #define VID_HARDWARE_ZR356700 28 /* Zoran 36700 series */ 327 - #define VID_HARDWARE_W9966 29 328 - #define VID_HARDWARE_SE401 30 /* SE401 USB webcams */ 329 - #define VID_HARDWARE_PWC 31 /* Philips webcams */ 330 - #define VID_HARDWARE_MEYE 32 /* Sony Vaio MotionEye cameras */ 331 - #define VID_HARDWARE_CPIA2 33 332 - #define VID_HARDWARE_VICAM 34 333 - #define VID_HARDWARE_SF16FMR2 35 334 - #define VID_HARDWARE_W9968CF 36 335 - #define VID_HARDWARE_SAA7114H 37 336 - #define VID_HARDWARE_SN9C102 38 337 - #define VID_HARDWARE_ARV 39 338 - 339 297 #endif /* CONFIG_VIDEO_V4L1_COMPAT */ 340 298 341 299 #endif /* __LINUX_VIDEODEV_H */
-1
include/media/v4l2-dev.h
··· 94 94 char name[32]; 95 95 int type; /* v4l1 */ 96 96 int type2; /* v4l2 */ 97 - int hardware; 98 97 int minor; 99 98 100 99 int debug; /* Activates debug level*/
-1
sound/i2c/other/tea575x-tuner.c
··· 189 189 tea->vd.owner = tea->card->module; 190 190 strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio"); 191 191 tea->vd.type = VID_TYPE_TUNER; 192 - tea->vd.hardware = VID_HARDWARE_RTRACK; /* FIXME: assign new number */ 193 192 tea->vd.release = snd_tea575x_release; 194 193 video_set_drvdata(&tea->vd, tea); 195 194 tea->vd.fops = &tea->fops;