V4L/DVB (6320): v4l core: remove the unused .hardware V4L1 field
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 15 Oct 2007 15:09:17 +0000 (12:09 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 22 Oct 2007 14:01:24 +0000 (12:01 -0200)
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>
35 files changed:
drivers/media/radio/miropcm20-radio.c
drivers/media/video/arv.c
drivers/media/video/bt8xx/bttv-driver.c
drivers/media/video/bw-qcam.c
drivers/media/video/c-qcam.c
drivers/media/video/cpia.c
drivers/media/video/cpia2/cpia2_v4l.c
drivers/media/video/cx88/cx88-video.c
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/et61x251/et61x251_core.c
drivers/media/video/meye.c
drivers/media/video/ov511.c
drivers/media/video/planb.c
drivers/media/video/pms.c
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
drivers/media/video/pwc/pwc-if.c
drivers/media/video/saa7134/saa7134-empress.c
drivers/media/video/saa7134/saa7134-video.c
drivers/media/video/se401.c
drivers/media/video/sn9c102/sn9c102_core.c
drivers/media/video/stradis.c
drivers/media/video/stv680.c
drivers/media/video/usbvideo/usbvideo.c
drivers/media/video/usbvideo/vicam.c
drivers/media/video/usbvision/usbvision-video.c
drivers/media/video/videocodec.c
drivers/media/video/vivi.c
drivers/media/video/w9966.c
drivers/media/video/w9968cf.c
drivers/media/video/zc0301/zc0301_core.c
drivers/media/video/zoran_card.c
drivers/media/video/zoran_driver.c
include/linux/videodev.h
include/media/v4l2-dev.h
sound/i2c/other/tea575x-tuner.c

index c7c9d1dc06905cb4074c9def7e5bef4c9e05b9d5..3ae56fef8c92f58ce4d2b2123606b795e0adf503 100644 (file)
@@ -229,7 +229,6 @@ static struct video_device pcm20_radio = {
        .owner          = THIS_MODULE,
        .name           = "Miro PCM 20 radio",
        .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_RTRACK,
        .fops           = &pcm20_fops,
        .priv           = &pcm20_unit
 };
index 19e9929ffa0fb74adc7c2df4ebf9944b2e551632..c94a4d0f280475c987b306d9716596c35d9256b7 100644 (file)
@@ -755,7 +755,6 @@ static struct video_device ar_template = {
        .owner          = THIS_MODULE,
        .name           = "Colour AR VGA",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_ARV,
        .fops           = &ar_fops,
        .release        = ar_release,
        .minor          = -1,
index 7a332b3efe51e0aefe5564b5ba58da13c3c6dcb9..9feeb636ff9b6e4e05c9913c06a77975de232cc9 100644 (file)
@@ -3877,7 +3877,6 @@ static struct video_device bttv_video_template =
        .name     = "UNSET",
        .type     = VID_TYPE_CAPTURE|VID_TYPE_TUNER|
                    VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-       .hardware = VID_HARDWARE_BT848,
        .fops     = &bttv_fops,
        .minor    = -1,
 };
@@ -3886,7 +3885,6 @@ static struct video_device bttv_vbi_template =
 {
        .name     = "bt848/878 vbi",
        .type     = VID_TYPE_TUNER|VID_TYPE_TELETEXT,
-       .hardware = VID_HARDWARE_BT848,
        .fops     = &bttv_fops,
        .minor    = -1,
 };
@@ -4034,7 +4032,6 @@ static struct video_device radio_template =
 {
        .name     = "bt848/878 radio",
        .type     = VID_TYPE_TUNER,
-       .hardware = VID_HARDWARE_BT848,
        .fops     = &radio_fops,
        .minor    = -1,
 };
index 7f7e3d3398d0d24e51654d55cf2a1e22aa64e1ba..58423525591fbce1f1e3f876713b8e47f3bced79 100644 (file)
@@ -899,7 +899,6 @@ static struct video_device qcam_template=
        .owner          = THIS_MODULE,
        .name           = "Connectix Quickcam",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_QCAM_BW,
        .fops           = &qcam_fops,
 };
 
index f76c6a6c37667cd40564654346d18814f245186a..cf1546b5a7f1b33e8f8f7d8e865fa54f4fe518e5 100644 (file)
@@ -699,7 +699,6 @@ static struct video_device qcam_template=
        .owner          = THIS_MODULE,
        .name           = "Colour QuickCam",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_QCAM_C,
        .fops           = &qcam_fops,
 };
 
index a1d02e5ce0fda4dbcf83c8371f3f31e29abb3d6a..7c630f5ee7258faccf51b06180c76859e5f502da 100644 (file)
@@ -65,10 +65,6 @@ MODULE_PARM_DESC(colorspace_conv,
 
 #define ABOUT "V4L-Driver for Vision CPiA based cameras"
 
-#ifndef VID_HARDWARE_CPIA
-#define VID_HARDWARE_CPIA 24    /* FIXME -> from linux/videodev.h */
-#endif
-
 #define CPIA_MODULE_CPIA                       (0<<5)
 #define CPIA_MODULE_SYSTEM                     (1<<5)
 #define CPIA_MODULE_VP_CTRL                    (5<<5)
@@ -3804,7 +3800,6 @@ static struct video_device cpia_template = {
        .owner          = THIS_MODULE,
        .name           = "CPiA Camera",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_CPIA,
        .fops           = &cpia_fops,
 };
 
index e3aaba1e0e0a285a7cfca4970102098ea884852c..e378abec806d21ddb75145ed7bb788bc620b57fc 100644 (file)
@@ -86,10 +86,6 @@ MODULE_LICENSE("GPL");
 
 #define ABOUT "V4L-Driver for Vision CPiA2 based cameras"
 
-#ifndef VID_HARDWARE_CPIA2
-#error "VID_HARDWARE_CPIA2 should have been defined in linux/videodev.h"
-#endif
-
 struct control_menu_info {
        int value;
        char name[32];
@@ -1942,7 +1938,6 @@ static struct video_device cpia2_template = {
        .type=          VID_TYPE_CAPTURE,
        .type2 =        V4L2_CAP_VIDEO_CAPTURE |
                        V4L2_CAP_STREAMING,
-       .hardware=      VID_HARDWARE_CPIA2,
        .minor=         -1,
        .fops=          &fops_template,
        .release=       video_device_release,
index 231ae6c4dd229f5327dffba44f5379db71b2c77e..5ee05f8f3fad3091d11e2d8381012f5533bbadaa 100644 (file)
@@ -1675,7 +1675,6 @@ static struct video_device cx8800_radio_template =
 {
        .name                 = "cx8800-radio",
        .type                 = VID_TYPE_TUNER,
-       .hardware             = 0,
        .fops                 = &radio_fops,
        .minor                = -1,
        .vidioc_querycap      = radio_querycap,
index e467682aabd7744de6beaa87f5e72cde344970e4..a4c2a907124a6529c38e143e2eeb60ed3958746d 100644 (file)
@@ -1617,7 +1617,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
        /* Fills VBI device info */
        dev->vbi_dev->type = VFL_TYPE_VBI;
-       dev->vbi_dev->hardware = 0;
        dev->vbi_dev->fops = &em28xx_v4l_fops;
        dev->vbi_dev->minor = -1;
        dev->vbi_dev->dev = &dev->udev->dev;
@@ -1629,7 +1628,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
        dev->vdev->type = VID_TYPE_CAPTURE;
        if (dev->has_tuner)
                dev->vdev->type |= VID_TYPE_TUNER;
-       dev->vdev->hardware = 0;
        dev->vdev->fops = &em28xx_v4l_fops;
        dev->vdev->minor = -1;
        dev->vdev->dev = &dev->udev->dev;
index d5fef4c01c87a9ff0f100a34f9925670245a32eb..d19d73b81edef7b37140a092b3365f2538a72480 100644 (file)
@@ -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->owner = THIS_MODULE;
        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-       cam->v4ldev->hardware = 0;
        cam->v4ldev->fops = &et61x251_fops;
        cam->v4ldev->minor = video_nr[dev_nr];
        cam->v4ldev->release = video_device_release;
index 69283926a8dcd685bca62de0bc3bec5c60202ebe..c3116329043276640c28e6aa9ccf3ca064a25f43 100644 (file)
@@ -1762,7 +1762,6 @@ static struct video_device meye_template = {
        .owner          = THIS_MODULE,
        .name           = "meye",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_MEYE,
        .fops           = &meye_fops,
        .release        = video_device_release,
        .minor          = -1,
index b8d4ac0d938e472a9118c7b1ceec7a5f1b9ada34..d55d5800efb463cb19de27ac6ecd670bbfd6152f 100644 (file)
@@ -4668,7 +4668,6 @@ static struct video_device vdev_template = {
        .owner =        THIS_MODULE,
        .name =         "OV511 USB Camera",
        .type =         VID_TYPE_CAPTURE,
-       .hardware =     VID_HARDWARE_OV511,
        .fops =         &ov511_fops,
        .release =      video_device_release,
        .minor =        -1,
index 0ef73d9d5848554054889c5b83540db000b3fc7a..ce4b2f9791ee5718535435f59f9e833ce4087c01 100644 (file)
@@ -2013,7 +2013,6 @@ static struct video_device planb_template=
        .owner          = THIS_MODULE,
        .name           = PLANB_DEVICE_NAME,
        .type           = VID_TYPE_OVERLAY,
-       .hardware       = VID_HARDWARE_PLANB,
        .open           = planb_open,
        .close          = planb_close,
        .read           = planb_read,
index b5a67f0dd19f95b6cb3ef88f87525056bc91139f..6820c2aabd303affccde30951bd018bc7f1d5673 100644 (file)
@@ -895,7 +895,6 @@ static struct video_device pms_template=
        .owner          = THIS_MODULE,
        .name           = "Mediavision PMS",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_PMS,
        .fops           = &pms_fops,
 };
 
index 4563b3df8a0d3bbbab866bf2c71a5317f061acc1..7a596ea7cfe698bc59d7f39299845d73e91dfd1c 100644 (file)
@@ -1121,15 +1121,12 @@ static const struct file_operations vdev_fops = {
 };
 
 
-#define VID_HARDWARE_PVRUSB2    38  /* FIXME : need a good value */
-
 static struct video_device vdev_template = {
        .owner      = THIS_MODULE,
        .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),
-       .hardware   = VID_HARDWARE_PVRUSB2,
        .fops       = &vdev_fops,
 };
 
index 950da254214870a366a39dc26843b66cb90f962e..7300ace8f44ed1331bb5f385b3821dfb749aedf9 100644 (file)
@@ -166,7 +166,6 @@ static struct video_device pwc_template = {
        .owner =        THIS_MODULE,
        .name =         "Philips Webcam",       /* Filled in later */
        .type =         VID_TYPE_CAPTURE,
-       .hardware =     VID_HARDWARE_PWC,
        .release =      video_device_release,
        .fops =         &pwc_fops,
        .minor =        -1,
index 34ca874dd7fe4e8a65a8643a682954ae1fb80e15..0a7d94319685e93582bd82db0d3f97e0d0a313c3 100644 (file)
@@ -342,7 +342,6 @@ static struct video_device saa7134_empress_template =
        .name          = "saa7134-empress",
        .type          = 0 /* FIXME */,
        .type2         = 0 /* FIXME */,
-       .hardware      = 0,
        .fops          = &ts_fops,
        .minor         = -1,
 };
index 471b92793c124aca8a94626390ef079175a3c53c..2b0897770531f5b7d1561426e00891038ea2782e 100644 (file)
@@ -2352,7 +2352,6 @@ struct video_device saa7134_video_template =
        .name          = "saa7134-video",
        .type          = VID_TYPE_CAPTURE|VID_TYPE_TUNER|
                         VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-       .hardware      = 0,
        .fops          = &video_fops,
        .minor         = -1,
 };
@@ -2361,7 +2360,6 @@ struct video_device saa7134_vbi_template =
 {
        .name          = "saa7134-vbi",
        .type          = VID_TYPE_TUNER|VID_TYPE_TELETEXT,
-       .hardware      = 0,
        .fops          = &video_fops,
        .minor         = -1,
 };
@@ -2370,7 +2368,6 @@ struct video_device saa7134_radio_template =
 {
        .name          = "saa7134-radio",
        .type          = VID_TYPE_TUNER,
-       .hardware      = 0,
        .fops          = &radio_fops,
        .minor         = -1,
 };
index 93fb04ed99a040d2e28512e21505e424f3133e69..d5d7d6cf734aba40ca0c224051a206bd52fd1b4a 100644 (file)
@@ -1231,7 +1231,6 @@ static struct video_device se401_template = {
        .owner =        THIS_MODULE,
        .name =         "se401 USB camera",
        .type =         VID_TYPE_CAPTURE,
-       .hardware =     VID_HARDWARE_SE401,
        .fops =         &se401_fops,
 };
 
index 6991e06f7651a1601c33688f10bc4e1f16e37f5d..511847912c485fbb2ec85a125e1bd9a29032dd5b 100644 (file)
@@ -3319,7 +3319,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
        strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
        cam->v4ldev->owner = THIS_MODULE;
        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-       cam->v4ldev->hardware = 0;
        cam->v4ldev->fops = &sn9c102_fops;
        cam->v4ldev->minor = video_nr[dev_nr];
        cam->v4ldev->release = video_device_release;
index eb220461ac77a8e9f973dae81f837ee4ae54a198..3fb85af5d1f2b8ab45140661298a53062c920fb3 100644 (file)
@@ -1917,7 +1917,6 @@ static const struct file_operations saa_fops = {
 static struct video_device saa_template = {
        .name = "SAA7146A",
        .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
-       .hardware = VID_HARDWARE_SAA7146,
        .fops = &saa_fops,
        .minor = -1,
 };
index 9e009a7ab863d020a9fe01e42c4174027c5c8af3..afc32aa56fde2eb3952cb69dd214cdd9cd52701b 100644 (file)
@@ -1398,7 +1398,6 @@ static struct video_device stv680_template = {
        .owner =        THIS_MODULE,
        .name =         "STV0680 USB camera",
        .type =         VID_TYPE_CAPTURE,
-       .hardware =     VID_HARDWARE_SE401,
        .fops =         &stv680_fops,
        .release =      video_device_release,
        .minor =        -1,
index 37ce36b9e5878bc9123691e3b859b442995b93bd..fb434b5602a3d5e2c8a76fccb45c9eeba5fd9e8a 100644 (file)
@@ -952,7 +952,6 @@ static const struct file_operations usbvideo_fops = {
 static const struct video_device usbvideo_template = {
        .owner =      THIS_MODULE,
        .type =       VID_TYPE_CAPTURE,
-       .hardware =   VID_HARDWARE_CPIA,
        .fops =       &usbvideo_fops,
 };
 
index db3c9e3deb26a86a91a4ba302adae3f7b7197851..da1ba0211108939810983cb3753588d713c257ef 100644 (file)
@@ -1074,7 +1074,6 @@ static struct video_device vicam_template = {
        .owner          = THIS_MODULE,
        .name           = "ViCam-based USB Camera",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_VICAM,
        .fops           = &vicam_fops,
        .minor          = -1,
 };
index e2f3c01cfa134c2290507d3de9d806554bbc69a6..36e689fa16c09f1b0afdbbd25b4a2fbf5f260125 100644 (file)
@@ -1400,7 +1400,6 @@ static const struct file_operations usbvision_fops = {
 static struct video_device usbvision_video_template = {
        .owner             = THIS_MODULE,
        .type           = VID_TYPE_TUNER | VID_TYPE_CAPTURE,
-       .hardware       = VID_HARDWARE_USBVISION,
        .fops           = &usbvision_fops,
        .name           = "usbvision-video",
        .release        = video_device_release,
@@ -1455,7 +1454,6 @@ static struct video_device usbvision_radio_template=
 {
        .owner             = THIS_MODULE,
        .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_USBVISION,
        .fops           = &usbvision_radio_fops,
        .name           = "usbvision-radio",
        .release        = video_device_release,
@@ -1492,7 +1490,6 @@ static struct video_device usbvision_vbi_template=
 {
        .owner             = THIS_MODULE,
        .type           = VID_TYPE_TUNER,
-       .hardware       = VID_HARDWARE_USBVISION,
        .fops           = &usbvision_vbi_fops,
        .release        = video_device_release,
        .name           = "usbvision-vbi",
index f2bbd7a4d562850ffb306c584b61a10b9b2ab330..87951ec8254f47cd8be33557237cd7bedf54d902 100644 (file)
@@ -86,8 +86,8 @@ videocodec_attach (struct videocodec_master *master)
        }
 
        dprintk(2,
-               "videocodec_attach: '%s', type: %x, flags %lx, magic %lx\n",
-               master->name, master->type, master->flags, master->magic);
+               "videocodec_attach: '%s', flags %lx, magic %lx\n",
+               master->name, master->flags, master->magic);
 
        if (!h) {
                dprintk(1,
index b532aa280a1be1b4b509b0f184de25e59b92d5df..ee73dc75131ccb5348089ed9548f737937d4cc0c 100644 (file)
@@ -1119,7 +1119,6 @@ static const struct file_operations vivi_fops = {
 static struct video_device vivi = {
        .name           = "vivi",
        .type           = VID_TYPE_CAPTURE,
-       .hardware       = 0,
        .fops           = &vivi_fops,
        .minor          = -1,
 //     .release        = video_device_release,
index 47366408637c7928a7a097a9ebffda1aa90125f0..08aaae07c7e0cb3c4a58e386bb49312068c2f613 100644 (file)
@@ -196,7 +196,6 @@ static struct video_device w9966_template = {
        .owner          = THIS_MODULE,
        .name           = W9966_DRIVERNAME,
        .type           = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
-       .hardware       = VID_HARDWARE_W9966,
        .fops           = &w9966_fops,
 };
 
index 9e7f3e685d73a1c6bae57fee2cbf593f577a7b0f..2ae1430f5f7d0165942d2427d80fdaa833448213 100644 (file)
@@ -3549,7 +3549,6 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
        strcpy(cam->v4ldev->name, symbolic(camlist, mod_id));
        cam->v4ldev->owner = THIS_MODULE;
        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-       cam->v4ldev->hardware = VID_HARDWARE_W9968CF;
        cam->v4ldev->fops = &w9968cf_fops;
        cam->v4ldev->minor = video_nr[dev_nr];
        cam->v4ldev->release = video_device_release;
index 08a93c31c0a0e6e542a8a149769d076d577bdbfe..2c5665c824423360481ea49a5f388a4a79c76223 100644 (file)
@@ -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->owner = THIS_MODULE;
        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-       cam->v4ldev->hardware = 0;
        cam->v4ldev->fops = &zc0301_fops;
        cam->v4ldev->minor = video_nr[dev_nr];
        cam->v4ldev->release = video_device_release;
index 48da36a15fcae475ea0a10bb384d6be5b0651e41..6e0ac4c5c379683187645e104e467b82c171b196 100644 (file)
@@ -1235,8 +1235,14 @@ zoran_setup_videocodec (struct zoran *zr,
                return m;
        }
 
-       m->magic = 0L; /* magic not used */
-       m->type = VID_HARDWARE_ZR36067;
+       /* magic and type are unused for master struct. Makes sense only at
+          codec structs.
+          In the past, .type were initialized to the old V4L1 .hardware
+          value, as VID_HARDWARE_ZR36067
+        */
+       m->magic = 0L;
+       m->type = 0;
+
        m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER;
        strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name));
        m->data = zr;
index 419e5af785332925a997ec3224c867e92dffb7d4..dd3d7d2c8b0e38323ed29e2a9b21a6a429a46111 100644 (file)
@@ -60,7 +60,6 @@
 
 #include <linux/spinlock.h>
 #define     MAP_NR(x)       virt_to_page(x)
-#define     ZORAN_HARDWARE  VID_HARDWARE_ZR36067
 #define     ZORAN_VID_TYPE  ( \
                                VID_TYPE_CAPTURE | \
                                VID_TYPE_OVERLAY | \
@@ -4659,7 +4658,6 @@ struct video_device zoran_template __devinitdata = {
 #ifdef CONFIG_VIDEO_V4L2
        .type2 = ZORAN_V4L2_VID_FLAGS,
 #endif
-       .hardware = ZORAN_HARDWARE,
        .fops = &zoran_fops,
        .release = &zoran_vdev_release,
        .minor = -1
index 8dba97a291f67dda20e69bd7d35f11a43881587b..52e3d5fd5be45438193873ff938c5871b1890f39 100644 (file)
@@ -294,48 +294,6 @@ struct video_code
 #define VID_PLAY_RESET                 13
 #define VID_PLAY_END_MARK              14
 
-
-
-#define VID_HARDWARE_BT848     1
-#define VID_HARDWARE_QCAM_BW   2
-#define VID_HARDWARE_PMS       3
-#define VID_HARDWARE_QCAM_C    4
-#define VID_HARDWARE_PSEUDO    5
-#define VID_HARDWARE_SAA5249   6
-#define VID_HARDWARE_AZTECH    7
-#define VID_HARDWARE_SF16MI    8
-#define VID_HARDWARE_RTRACK    9
-#define VID_HARDWARE_ZOLTRIX   10
-#define VID_HARDWARE_SAA7146    11
-#define VID_HARDWARE_VIDEUM    12      /* Reserved for Winnov videum */
-#define VID_HARDWARE_RTRACK2   13
-#define VID_HARDWARE_PERMEDIA2 14      /* Reserved for Permedia2 */
-#define VID_HARDWARE_RIVA128   15      /* Reserved for RIVA 128 */
-#define VID_HARDWARE_PLANB     16      /* PowerMac motherboard video-in */
-#define VID_HARDWARE_BROADWAY  17      /* Broadway project */
-#define VID_HARDWARE_GEMTEK    18
-#define VID_HARDWARE_TYPHOON   19
-#define VID_HARDWARE_VINO      20      /* SGI Indy Vino */
-#define VID_HARDWARE_CADET     21      /* Cadet radio */
-#define VID_HARDWARE_TRUST     22      /* Trust FM Radio */
-#define VID_HARDWARE_TERRATEC  23      /* TerraTec ActiveRadio */
-#define VID_HARDWARE_CPIA      24
-#define VID_HARDWARE_ZR36120   25      /* Zoran ZR36120/ZR36125 */
-#define VID_HARDWARE_ZR36067   26      /* Zoran ZR36067/36060 */
-#define VID_HARDWARE_OV511     27
-#define VID_HARDWARE_ZR356700  28      /* Zoran 36700 series */
-#define VID_HARDWARE_W9966     29
-#define VID_HARDWARE_SE401     30      /* SE401 USB webcams */
-#define VID_HARDWARE_PWC       31      /* Philips webcams */
-#define VID_HARDWARE_MEYE      32      /* Sony Vaio MotionEye cameras */
-#define VID_HARDWARE_CPIA2     33
-#define VID_HARDWARE_VICAM      34
-#define VID_HARDWARE_SF16FMR2  35
-#define VID_HARDWARE_W9968CF   36
-#define VID_HARDWARE_SAA7114H   37
-#define VID_HARDWARE_SN9C102   38
-#define VID_HARDWARE_ARV       39
-
 #endif /* CONFIG_VIDEO_V4L1_COMPAT */
 
 #endif /* __LINUX_VIDEODEV_H */
index e75d5e6c4cea083ed8429b1fe1adaa09d6e63cd9..4c5d66e2da674a822e26a1d515ea00d709f45ba0 100644 (file)
@@ -94,7 +94,6 @@ struct video_device
        char name[32];
        int type;       /* v4l1 */
        int type2;      /* v4l2 */
-       int hardware;
        int minor;
 
        int debug;      /* Activates debug level*/
index fe31bb5cffb8aa449cfb57b4bbf54f2e59e9bb48..37c47fb95aca43fa63058143ee4edf7fffe7be79 100644 (file)
@@ -189,7 +189,6 @@ void snd_tea575x_init(struct snd_tea575x *tea)
        tea->vd.owner = tea->card->module;
        strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio");
        tea->vd.type = VID_TYPE_TUNER;
-       tea->vd.hardware = VID_HARDWARE_RTRACK; /* FIXME: assign new number */
        tea->vd.release = snd_tea575x_release;
        video_set_drvdata(&tea->vd, tea);
        tea->vd.fops = &tea->fops;