[media] media: remove the setting of the flag V4L2_FL_USE_FH_PRIO

Since all the drivers that use `struct v4l2_fh' use the core
priority checking, the setting of the flag in the drivers can
be removed.

Signed-off-by: Ramakrishnan Muthukrishnan <ramakrmu@cisco.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index eda01bc68ab200272f9c4b247302f407d5ae13f4..f2cc521e3743ef04b1f11c3b8d922a9cb5927872 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -613,7 +613,6 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
        vfd->lock = &dev->v4l2_lock;
        vfd->v4l2_dev = &dev->v4l2_dev;
        vfd->tvnorms = 0;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        for (i = 0; i < dev->ext_vv_data->num_stds; i++)
                vfd->tvnorms |= dev->ext_vv_data->stds[i].id;
        strlcpy(vfd->name, name, sizeof(vfd->name));

diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
index 416507a83668f6d0cd70cac4e24c7f32aa8a44e5..3c5dac4c1eab770553bd4b67d289fb50126f48d6 100644 (file)
--- a/drivers/media/parport/bw-qcam.c
+++ b/drivers/media/parport/bw-qcam.c
@@ -990,7 +990,6 @@ static struct qcam *qcam_init(struct parport *port)
        qcam->vdev.fops = &qcam_fops;
        qcam->vdev.lock = &qcam->lock;
        qcam->vdev.ioctl_ops = &qcam_ioctl_ops;
-       set_bit(V4L2_FL_USE_FH_PRIO, &qcam->vdev.flags);
        qcam->vdev.release = video_device_release_empty;
        video_set_drvdata(&qcam->vdev, qcam);
 

diff --git a/drivers/media/parport/c-qcam.c b/drivers/media/parport/c-qcam.c
index ec51e1f12e823b47e7567f57884670a8f94364c9..b9010bd3ed3e842de488d05a64cbb71e37fcbe2a 100644 (file)
--- a/drivers/media/parport/c-qcam.c
+++ b/drivers/media/parport/c-qcam.c
@@ -761,7 +761,6 @@ static struct qcam *qcam_init(struct parport *port)
        qcam->vdev.ioctl_ops = &qcam_ioctl_ops;
        qcam->vdev.release = video_device_release_empty;
        qcam->vdev.ctrl_handler = &qcam->hdl;
-       set_bit(V4L2_FL_USE_FH_PRIO, &qcam->vdev.flags);
        video_set_drvdata(&qcam->vdev, qcam);
 
        mutex_init(&qcam->lock);

diff --git a/drivers/media/parport/pms.c b/drivers/media/parport/pms.c
index 66c957a02ba7bfbfed0cf8a3939808de56f3ff88..9bc105b3db1bcec5dbb775f591188d7ec34e1adf 100644 (file)
--- a/drivers/media/parport/pms.c
+++ b/drivers/media/parport/pms.c
@@ -1091,7 +1091,6 @@ static int pms_probe(struct device *pdev, unsigned int card)
        dev->vdev.release = video_device_release_empty;
        dev->vdev.lock = &dev->lock;
        dev->vdev.tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags);
        video_set_drvdata(&dev->vdev, dev);
        dev->std = V4L2_STD_NTSC_M;
        dev->height = 240;

diff --git a/drivers/media/parport/w9966.c b/drivers/media/parport/w9966.c
index db2a6003a1c3990e032f9fd2a5a9ff40bbb595ba..f7502f3a6a3c78188c11641e376b50a51ef1c105 100644 (file)
--- a/drivers/media/parport/w9966.c
+++ b/drivers/media/parport/w9966.c
@@ -883,7 +883,6 @@ static int w9966_init(struct w9966 *cam, struct parport *port)
        cam->vdev.ioctl_ops = &w9966_ioctl_ops;
        cam->vdev.release = video_device_release_empty;
        cam->vdev.ctrl_handler = &cam->hdl;
-       set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags);
        video_set_drvdata(&cam->vdev, cam);
 
        mutex_init(&cam->lock);

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index da780f42b1219862de792a127379eaa94a4d9857..970e542d3a51fabcc17f2be4e371b9ccdd55cc36 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3886,7 +3886,6 @@ static struct video_device *vdev_init(struct bttv *btv,
        vfd->v4l2_dev = &btv->c.v4l2_dev;
        vfd->release = video_device_release;
        vfd->debug   = bttv_debug;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        video_set_drvdata(vfd, btv);
        snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
                 btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "",

diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index 843c62b2f482fdd905909dfb6cf4e382433bcbc9..f3541b5156ce005d36c5727bb5f4d778448a31f6 100644 (file)
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -375,7 +375,6 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
        s->video_dev->release = video_device_release;
        s->video_dev->tvnorms = V4L2_STD_ALL;
        s->video_dev->lock = &cx->serialize_lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &s->video_dev->flags);
        cx18_set_funcs(s->video_dev);
        return 0;
 }

diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index d270819fd8751417bb6fb60c2af1483e23a8a19a..8d2f1abeef77b098b50d8f6d5d3991f4550073be 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -1109,7 +1109,6 @@ int cx25821_video_register(struct cx25821_dev *dev)
                else
                        vdev->vfl_dir = VFL_DIR_TX;
                vdev->lock = &dev->lock;
-               set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
                snprintf(vdev->name, sizeof(vdev->name), "%s #%d", dev->name, i);
                video_set_drvdata(vdev, chan);
 

diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
index e061c88b697efd805f41764ac5819fc307d6ae42..71630238027b74555acc08e0506a2166ffd72d60 100644 (file)
--- a/drivers/media/pci/cx88/cx88-core.c
+++ b/drivers/media/pci/cx88/cx88-core.c
@@ -1045,7 +1045,6 @@ struct video_device *cx88_vdev_init(struct cx88_core *core,
        vfd->release = video_device_release;
        snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                 core->name, type, core->board.name);
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        return vfd;
 }
 

diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c
index 70dad588a677ca45b9b08ee8d4ab6d967add0185..f0a1cc472313cc5c42292c59900539f2e43494f1 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-streams.c
+++ b/drivers/media/pci/ivtv/ivtv-streams.c
@@ -251,7 +251,6 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
                v4l2_disable_ioctl(s->vdev, VIDIOC_G_TUNER);
                v4l2_disable_ioctl(s->vdev, VIDIOC_S_STD);
        }
-       set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev->flags);
        ivtv_set_funcs(s->vdev);
        return 0;
 }

diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 54d5c821007cb4280ff5a41e5fbda3bfd2f5484c..1a77f8dfafa555f35f8c2815dc3d283aad88e7dd 100644 (file)
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1749,7 +1749,6 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
 
        v4l2_ctrl_handler_setup(&meye.hdl);
        meye.vdev->ctrl_handler = &meye.hdl;
-       set_bit(V4L2_FL_USE_FH_PRIO, &meye.vdev->flags);
 
        if (video_register_device(meye.vdev, VFL_TYPE_GRABBER,
                                  video_nr) < 0) {

diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index be19a051a492902caf7d630efa3e4c5a1e214b1b..9ff03a69ced46f3bda31d10c7ac527c04064b68d 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -811,7 +811,6 @@ static struct video_device *vdev_init(struct saa7134_dev *dev,
        vfd->release = video_device_release;
        snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                 dev->name, type, saa7134_boards[dev->board].name);
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        video_set_drvdata(vfd, dev);
        return vfd;
 }

diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index e65c760e4e8bbc5df3da9d4fa970d003d6e0cc66..5526ed5444fb6bd93ca3aec5c45a6e08d8a6f824 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -270,7 +270,6 @@ static int empress_init(struct saa7134_dev *dev)
        snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name),
                 "%s empress (%s)", dev->name,
                 saa7134_boards[dev->board].name);
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->empress_dev->flags);
        v4l2_ctrl_handler_init(hdl, 21);
        v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter);
        if (dev->empress_sd)

diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
index d2abd3b5c2bf0a63447701c714e535f124ed1976..f2d8c70d35f561b4bcd3bd68b7b7f428cd1df893 100644 (file)
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -1093,7 +1093,6 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev,
        vip->video_dev = &video_dev_template;
        vip->video_dev->v4l2_dev = &vip->v4l2_dev;
        vip->video_dev->queue = &vip->vb_vidq;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vip->video_dev->flags);
        video_set_drvdata(vip->video_dev, vip);
 
        ret = video_register_device(vip->video_dev, VFL_TYPE_GRABBER, -1);

diff --git a/drivers/media/platform/arv.c b/drivers/media/platform/arv.c
index e9410e41ae0cfd7f1e0c7d4fc6ae7e62c073b281..03c5098499c421e9313d0c4de9838711578f9069 100644 (file)
--- a/drivers/media/platform/arv.c
+++ b/drivers/media/platform/arv.c
@@ -773,7 +773,6 @@ static int __init ar_init(void)
        ar->vdev.fops = &ar_fops;
        ar->vdev.ioctl_ops = &ar_ioctl_ops;
        ar->vdev.release = video_device_release_empty;
-       set_bit(V4L2_FL_USE_FH_PRIO, &ar->vdev.flags);
        video_set_drvdata(&ar->vdev, ar);
 
        if (vga) {

diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index 16e4b1c525c4105d7fceec8844e57efb28fd3f11..6ef986657dda2300aaa73ae3aa4595307dc7604c 100644 (file)
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -966,7 +966,6 @@ static int bcap_probe(struct platform_device *pdev)
        vfd->ioctl_ops          = &bcap_ioctl_ops;
        vfd->tvnorms            = 0;
        vfd->v4l2_dev           = &bcap_dev->v4l2_dev;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        strncpy(vfd->name, CAPTURE_DRV_NAME, sizeof(vfd->name));
        bcap_dev->video_dev     = vfd;
 

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index bf5eff99452b82b581098e337e0adf6b1f47f0b4..73496d953ba0dfac061b65724bbd966a62b5795d 100644 (file)
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -1709,7 +1709,6 @@ static int register_device(struct vpbe_layer *vpbe_display_layer,
        vpbe_display_layer->disp_dev = disp_dev;
        /* set the driver data in platform device */
        platform_set_drvdata(pdev, disp_dev);
-       set_bit(V4L2_FL_USE_FH_PRIO, &vpbe_display_layer->video_dev.flags);
        video_set_drvdata(&vpbe_display_layer->video_dev,
                          vpbe_display_layer);
 

diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index a51bda2fb6379c814965b26c760566776188034e..ea7661a27479f4ef7cc7580b4e9fd11db7aceb9e 100644 (file)
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1916,7 +1916,6 @@ static int vpfe_probe(struct platform_device *pdev)
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,
                "video_dev=%x\n", (int)&vpfe_dev->video_dev);
        vpfe_dev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vpfe_dev->video_dev->flags);
        ret = video_register_device(vpfe_dev->video_dev,
                                    VFL_TYPE_GRABBER, -1);
 

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index ee0a5fcecbe43ada14e77d3af8343e03963b1159..2f90f0d98ad5ac598d5da41b7b045be5a0bb40fe 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1397,7 +1397,6 @@ static int vpif_probe_complete(void)
                vdev->vfl_dir = VFL_DIR_RX;
                vdev->queue = q;
                vdev->lock = &common->lock;
-               set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
                video_set_drvdata(ch->video_dev, ch);
                err = video_register_device(vdev,
                                            VFL_TYPE_GRABBER, (j ? 1 : 0));

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 5bb085b19bcbdad375ed9bbb52ab13851580127c..877b46e8b2e49ea2dc5edbc4b96cb36e44b013ed 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1223,7 +1223,6 @@ static int vpif_probe_complete(void)
                vdev->vfl_dir = VFL_DIR_TX;
                vdev->queue = q;
                vdev->lock = &common->lock;
-               set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
                video_set_drvdata(ch->video_dev, ch);
                err = video_register_device(vdev, VFL_TYPE_GRABBER,
                                            (j ? 3 : 2));

diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index deba425e3d8f61ecee4d57c1357036300c14e092..8ea520935867abb59deebe4ca989ffb0f8fc892a 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -1172,7 +1172,6 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
                goto err_vd_rel;
 
        video_set_drvdata(vfd, vp);
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
 
        v4l2_ctrl_handler_init(&vp->ctrl_handler, 1);
        ctrl = v4l2_ctrl_new_std(&vp->ctrl_handler, &s3c_camif_video_ctrl_ops,

diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 8a8dbc8fdfde052ac2f7fff489ac6871d51c2234..b4d2696501e409cfd765091b68ce0a017cbfdcca 100644 (file)
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -1109,8 +1109,6 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
                .ioctl_ops = &mxr_ioctl_ops,
        };
        strlcpy(layer->vfd.name, name, sizeof(layer->vfd.name));
-       /* let framework control PRIORITY */
-       set_bit(V4L2_FL_USE_FH_PRIO, &layer->vfd.flags);
 
        video_set_drvdata(&layer->vfd, layer);
        layer->vfd.lock = &layer->mutex;

diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index d00bf3df0f8a0bf6bf34996fa454ffdbd763d7e1..b7fbcdfc5862cc5b49ece8720a9125842da55701 100644 (file)
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -1459,7 +1459,6 @@ static int __init vivi_create_instance(int inst)
        vfd->debug = debug;
        vfd->v4l2_dev = &dev->v4l2_dev;
        vfd->queue = q;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
 
        /*
         * Provide a mutex to v4l2 core. It will be used to protect

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 142c2ee64d31522f30affdc223c48611e3e3e99c..2262b8139ca1e39d779d73fa22927467623f4683 100644 (file)
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -390,7 +390,6 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
        radio->videodev.release = video_device_release_empty;
        radio->videodev.lock = &radio->v4l2_lock;
        radio->videodev.ctrl_handler = &radio->hdl;
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags);
 
        radio->usbdev = interface_to_usbdev(intf);
        radio->curfreq = FREQ_MIN * FREQ_MUL;

diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index d719e59e21790a5ea4353ca4ea9cc28350cb155d..82affaedf06778ad73d0d40fa1a87b0e621630cd 100644 (file)
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -650,7 +650,6 @@ static int __init cadet_init(void)
        dev->vdev.ioctl_ops = &cadet_ioctl_ops;
        dev->vdev.release = video_device_release_empty;
        dev->vdev.lock = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags);
        video_set_drvdata(&dev->vdev, dev);
 
        res = video_register_device(&dev->vdev, VFL_TYPE_RADIO, radio_nr);

diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
index 6ff350831d56ef0974408ce378db1beb72cfe148..c309ee45a08e1ba3d5a747a35badac7767c15dfa 100644 (file)
--- a/drivers/media/radio/radio-isa.c
+++ b/drivers/media/radio/radio-isa.c
@@ -253,7 +253,6 @@ static int radio_isa_common_probe(struct radio_isa_card *isa,
        isa->vdev.fops = &radio_isa_fops;
        isa->vdev.ioctl_ops = &radio_isa_ioctl_ops;
        isa->vdev.release = video_device_release_empty;
-       set_bit(V4L2_FL_USE_FH_PRIO, &isa->vdev.flags);
        video_set_drvdata(&isa->vdev, isa);
        isa->freq = FREQ_LOW;
        isa->stereo = drv->has_stereo;

diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c
index 3d127825eceb7a06d95938a031dcaea8d696162a..67ac72e66850fd8d86344c21238f2cd614d883ee 100644 (file)
--- a/drivers/media/radio/radio-keene.c
+++ b/drivers/media/radio/radio-keene.c
@@ -380,7 +380,6 @@ static int usb_keene_probe(struct usb_interface *intf,
        usb_set_intfdata(intf, &radio->v4l2_dev);
 
        video_set_drvdata(&radio->vdev, radio);
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags);
 
        /* at least 11ms is needed in order to settle hardware */
        msleep(20);

diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c
index a85b064cb7bebfa61340f67f51624937a59bb4e2..b3000ef85ee715d0c500c2ae0bbb7dcc62073448 100644 (file)
--- a/drivers/media/radio/radio-ma901.c
+++ b/drivers/media/radio/radio-ma901.c
@@ -411,7 +411,6 @@ static int usb_ma901radio_probe(struct usb_interface *intf,
        radio->vdev.ioctl_ops = &usb_ma901radio_ioctl_ops;
        radio->vdev.release = video_device_release_empty;
        radio->vdev.lock = &radio->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags);
 
        radio->usbdev = interface_to_usbdev(intf);
        radio->intf = intf;

diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c
index a7e93d7477dd5e0d65cfe8729fe20562d20bd952..3d12edf520a0d10503e3eda05fadb25d7c6e2f59 100644 (file)
--- a/drivers/media/radio/radio-miropcm20.c
+++ b/drivers/media/radio/radio-miropcm20.c
@@ -210,7 +210,6 @@ static int __init pcm20_init(void)
        dev->vdev.ioctl_ops = &pcm20_ioctl_ops;
        dev->vdev.release = video_device_release_empty;
        dev->vdev.lock = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags);
        video_set_drvdata(&dev->vdev, dev);
        snd_aci_cmd(dev->aci, ACI_SET_TUNERMONO,
                        dev->audmode == V4L2_TUNER_MODE_MONO, -1);

diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index f47607163acbc9c6e295cb4aed39f17a95c64286..c2927fd12615d30e7a019db7bb681a95830505db 100644 (file)
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -558,7 +558,6 @@ static int usb_amradio_probe(struct usb_interface *intf,
        radio->vdev.ioctl_ops = &usb_amradio_ioctl_ops;
        radio->vdev.release = video_device_release_empty;
        radio->vdev.lock = &radio->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags);
 
        radio->usbdev = interface_to_usbdev(intf);
        radio->intf = intf;

diff --git a/drivers/media/radio/radio-raremono.c b/drivers/media/radio/radio-raremono.c
index 7b3bdbb1be735583798d1c52d0420fcbd1c207d8..bfb3a6d051bad35b6609a4affeb3a0c7e5f8f2fb 100644 (file)
--- a/drivers/media/radio/radio-raremono.c
+++ b/drivers/media/radio/radio-raremono.c
@@ -361,7 +361,6 @@ static int usb_raremono_probe(struct usb_interface *intf,
        usb_set_intfdata(intf, &radio->v4l2_dev);
 
        video_set_drvdata(&radio->vdev, radio);
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags);
 
        raremono_cmd_main(radio, BAND_FM, 95160);
 

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 6f4318ff0db36b8e9480955b5618f1d9c2db10e3..d7ce8fe6b5ae1a89c5c578a9f2d88d20aaeecca7 100644 (file)
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -344,7 +344,6 @@ static int __init fmi_init(void)
        fmi->vdev.fops = &fmi_fops;
        fmi->vdev.ioctl_ops = &fmi_ioctl_ops;
        fmi->vdev.release = video_device_release_empty;
-       set_bit(V4L2_FL_USE_FH_PRIO, &fmi->vdev.flags);
        video_set_drvdata(&fmi->vdev, fmi);
 
        mutex_init(&fmi->lock);

diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index 2fd9009f86633e74b4752472f5db2829daf6d9ce..633022b45f33798ed352a5d3499dd1b7fdb75b36 100644 (file)
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1470,7 +1470,6 @@ static int si476x_radio_probe(struct platform_device *pdev)
        video_set_drvdata(&radio->videodev, radio);
        platform_set_drvdata(pdev, radio);
 
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags);
 
        radio->v4l2dev.ctrl_handler = &radio->ctrl_handler;
        v4l2_ctrl_handler_init(&radio->ctrl_handler,

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 3ed1f5669f791b9d3015bb91efd80ba2fa82d0c0..925049654c5bc0f33429b45b5cab5fff3795f8e8 100644 (file)
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -478,7 +478,6 @@ static int tea5764_i2c_probe(struct i2c_client *client,
        video_set_drvdata(&radio->vdev, radio);
        radio->vdev.lock = &radio->mutex;
        radio->vdev.v4l2_dev = v4l2_dev;
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags);
 
        /* initialize and power off the chip */
        tea5764_i2c_read(radio);

diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c
index e2455970725af16c734759d62247976f9dd15222..83fe7ab358dfaa6eecc0013f0e3fb1036caeedb8 100644 (file)
--- a/drivers/media/radio/radio-tea5777.c
+++ b/drivers/media/radio/radio-tea5777.c
@@ -570,7 +570,6 @@ int radio_tea5777_init(struct radio_tea5777 *tea, struct module *owner)
        tea->fops = tea575x_fops;
        tea->fops.owner = owner;
        tea->vd.fops = &tea->fops;
-       set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
 
        tea->vd.ctrl_handler = &tea->ctrl_handler;
        v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);

diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index 0817964d9172dace61cc983dc417e940bea4a225..b9285e6584afa19d69b4f89f28f7735825e7b1c8 100644 (file)
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -126,7 +126,6 @@ static int timbradio_probe(struct platform_device *pdev)
        tr->video_dev.release = video_device_release_empty;
        tr->video_dev.minor = -1;
        tr->video_dev.lock = &tr->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &tr->video_dev.flags);
 
        strlcpy(tr->v4l2_dev.name, DRIVER_NAME, sizeof(tr->v4l2_dev.name));
        err = v4l2_device_register(NULL, &tr->v4l2_dev);

diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 07ef40595efda9ccb9e50bda9646d1c6f66b3926..494fac061306ed498a02dff4049cb0223d45f621 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -680,7 +680,6 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
        radio->videodev.lock = &radio->lock;
        radio->videodev.v4l2_dev = &radio->v4l2_dev;
        radio->videodev.release = video_device_release_empty;
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags);
        video_set_drvdata(&radio->videodev, radio);
 
        /* get device and chip versions */

diff --git a/drivers/media/radio/si4713/radio-platform-si4713.c b/drivers/media/radio/si4713/radio-platform-si4713.c
index ba4cfc946868c0cab30ad14728a117f146af6524..a47502a330f0228015da923097d8e54db80af4af 100644 (file)
--- a/drivers/media/radio/si4713/radio-platform-si4713.c
+++ b/drivers/media/radio/si4713/radio-platform-si4713.c
@@ -196,7 +196,6 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
        rsdev->radio_dev = radio_si4713_vdev_template;
        rsdev->radio_dev.v4l2_dev = &rsdev->v4l2_dev;
        rsdev->radio_dev.ctrl_handler = sd->ctrl_handler;
-       set_bit(V4L2_FL_USE_FH_PRIO, &rsdev->radio_dev.flags);
        /* Serialize all access to the si4713 */
        rsdev->radio_dev.lock = &rsdev->lock;
        video_set_drvdata(&rsdev->radio_dev, rsdev);

diff --git a/drivers/media/radio/si4713/radio-usb-si4713.c b/drivers/media/radio/si4713/radio-usb-si4713.c
index 86502b2786d06cd9abef8fcbe104fbde881439a3..a77319dcba05c2875d466c6866a36f6998c019b1 100644 (file)
--- a/drivers/media/radio/si4713/radio-usb-si4713.c
+++ b/drivers/media/radio/si4713/radio-usb-si4713.c
@@ -492,7 +492,6 @@ static int usb_si4713_probe(struct usb_interface *intf,
        radio->vdev.vfl_dir = VFL_DIR_TX;
 
        video_set_drvdata(&radio->vdev, radio);
-       set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags);
 
        retval = video_register_device(&radio->vdev, VFL_TYPE_RADIO, -1);
        if (retval < 0) {

diff --git a/drivers/media/radio/tea575x.c b/drivers/media/radio/tea575x.c
index 7c14060a40b87618abf66f5ec0603e7fce15bb4c..f1a0867789fe67bd136b669b376776333f5cf3e7 100644 (file)
--- a/drivers/media/radio/tea575x.c
+++ b/drivers/media/radio/tea575x.c
@@ -523,7 +523,6 @@ int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner)
        tea->fops = tea575x_fops;
        tea->fops.owner = owner;
        tea->vd.fops = &tea->fops;
-       set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
        /* disable hw_freq_seek if we can't use it */
        if (tea->cannot_read_data)
                v4l2_disable_ioctl(&tea->vd, VIDIOC_S_HW_FREQ_SEEK);

diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 385894a1ff68820cdf2a93ec33c2cd8760f96fd7..98f7ea1d6d6382109cfb119ffb62c6789693597b 100644 (file)
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -2016,14 +2016,12 @@ int au0828_analog_register(struct au0828_dev *dev,
        *dev->vdev = au0828_video_template;
        dev->vdev->v4l2_dev = &dev->v4l2_dev;
        dev->vdev->lock = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev->flags);
        strcpy(dev->vdev->name, "au0828a video");
 
        /* Setup the VBI device */
        *dev->vbi_dev = au0828_video_template;
        dev->vbi_dev->v4l2_dev = &dev->v4l2_dev;
        dev->vbi_dev->lock = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vbi_dev->flags);
        strcpy(dev->vbi_dev->name, "au0828a vbi");
 
        /* Register the v4l2 device */

diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c
index d5d42b6e94be128d49ec8a4dd2a0d8c452c42f48..9caea8344547a790db13b04690d5d5c14aaf9451 100644 (file)
--- a/drivers/media/usb/cpia2/cpia2_v4l.c
+++ b/drivers/media/usb/cpia2/cpia2_v4l.c
@@ -1169,7 +1169,6 @@ int cpia2_register_camera(struct camera_data *cam)
        cam->vdev.lock = &cam->v4l2_lock;
        cam->vdev.ctrl_handler = hdl;
        cam->vdev.v4l2_dev = &cam->v4l2_dev;
-       set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags);
 
        reset_camera_struct_v4l(cam);
 

diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index 30a0c69fb42f1a79b65850579aee2c683a7d26e9..f0400e260eb7b1d10c4d12909b1082f13d4e64b6 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -1923,7 +1923,6 @@ static struct video_device *cx231xx_video_dev_alloc(
        vfd->v4l2_dev = &dev->v4l2_dev;
        vfd->lock = &dev->lock;
        vfd->release = video_device_release;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        vfd->ctrl_handler = &dev->mpeg_ctrl_handler.hdl;
        video_set_drvdata(vfd, dev);
        if (dev->tuner_type == TUNER_ABSENT) {

diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index cba7fea3c6cda6b4c89f7aac6e202b4a233c8b7d..ae31ca2fc9a1fede2ce4fc715d495fc7f67ae0de 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -2065,7 +2065,6 @@ static struct video_device *cx231xx_vdev_init(struct cx231xx *dev,
        vfd->release = video_device_release;
        vfd->debug = video_debug;
        vfd->lock = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
 
        snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
 

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index f6b49c98e2c9f0d488cbadbfc7c4ef1b53b432ef..3f8b5aa7669a18de8e7b5e33d78e602f0f759cc0 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -2208,7 +2208,6 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
        vfd->v4l2_dev   = &dev->v4l2->v4l2_dev;
        vfd->debug      = video_debug;
        vfd->lock       = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        if (dev->board.is_webcam)
                vfd->tvnorms = 0;
 

diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index f9a75adcf637db5dd816677aaea278cb6c02d7e8..42d223239206a8b3c84c191c1ba4894447b093b5 100644 (file)
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -2066,7 +2066,6 @@ int gspca_dev_probe2(struct usb_interface *intf,
        gspca_dev->vdev = gspca_template;
        gspca_dev->vdev.v4l2_dev = &gspca_dev->v4l2_dev;
        video_set_drvdata(&gspca_dev->vdev, gspca_dev);
-       set_bit(V4L2_FL_USE_FH_PRIO, &gspca_dev->vdev.flags);
        gspca_dev->module = module;
        gspca_dev->present = 1;
 

diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 0500c4175d5f095d3b27322f298aeb7130ab95e7..dca4b65053aabf29ac8f5674d75a9fce8f7edf1e 100644 (file)
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -1240,7 +1240,6 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,
        strcpy(dev->video_dev->name, "Hauppauge HD PVR");
        dev->video_dev->v4l2_dev = &dev->v4l2_dev;
        video_set_drvdata(dev->video_dev, dev);
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->video_dev->flags);
 
        res = video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum);
        if (res < 0) {

diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index a73b0bced96f7b6880cbbf6f48df3e68e1a026dd..15b754da4a2c22f37f3cc763c2a1535b534778bf 100644 (file)
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -1013,7 +1013,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
        strcpy(pdev->vdev.name, name);
        pdev->vdev.queue = &pdev->vb_queue;
        pdev->vdev.queue->lock = &pdev->vb_queue_lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &pdev->vdev.flags);
        video_set_drvdata(&pdev->vdev, pdev);
 
        pdev->release = le16_to_cpu(udev->descriptor.bcdDevice);

diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index a44466bc7b86f4aae5d79510757e7a45abb91c28..2c901861034afd746a6fec9540e1ebf47f2c0156 100644 (file)
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -1676,7 +1676,6 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                vc->vdev.ctrl_handler = &vc->hdl;
                vc->vdev.lock = &dev->lock;
                vc->vdev.v4l2_dev = &dev->v4l2_dev;
-               set_bit(V4L2_FL_USE_FH_PRIO, &vc->vdev.flags);
                video_set_drvdata(&vc->vdev, vc);
                if (video_nr == -1)
                        ret = video_register_device(&vc->vdev,

diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index 5461341a31cba24090e197cde0a985f8d5599e2d..233054311a628028fc8a2533fccf34733086c285 100644 (file)
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -671,7 +671,6 @@ int stk1160_video_register(struct stk1160 *dev)
 
        /* This will be used to set video_device parent */
        dev->vdev.v4l2_dev = &dev->v4l2_dev;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags);
 
        /* NTSC is default */
        dev->norm = V4L2_STD_NTSC_M;

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index be77482c30704a5b81615199f563770c0147ec0f..d76860b6a0b810f87afa86ad13f390b32fd60bab 100644 (file)
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -1266,7 +1266,6 @@ static int stk_register_video_device(struct stk_camera *dev)
        dev->vdev.lock = &dev->lock;
        dev->vdev.debug = debug;
        dev->vdev.v4l2_dev = &dev->v4l2_dev;
-       set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags);
        video_set_drvdata(&dev->vdev, dev);
        err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
        if (err)

diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c
index ea6070ba835e8e863b085baaff7ea1137d32abd2..b391194a840c4258a2c7ce8cbc9974ad6970bd01 100644 (file)
--- a/drivers/media/usb/tlg2300/pd-radio.c
+++ b/drivers/media/usb/tlg2300/pd-radio.c
@@ -327,7 +327,6 @@ int poseidon_fm_init(struct poseidon *p)
        }
        vfd->v4l2_dev = &p->v4l2_dev;
        vfd->ctrl_handler = hdl;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        video_set_drvdata(vfd, p);
        return video_register_device(vfd, VFL_TYPE_RADIO, -1);
 }

diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index e6b3d5d83d43033667203f642655e2df33df4f0c..9bde0642ffd1e49a7ed4de237208a66f025b2f20 100644 (file)
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -1626,7 +1626,6 @@ static struct video_device *vdev_init(struct tm6000_core *dev,
        vfd->release = video_device_release;
        vfd->debug = tm6000_debug;
        vfd->lock = &dev->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
 
        snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
 

diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 2967e808408bb48217a5dba945c06ae5f500fa1d..030c5854b4b3e45913a6a5d70bb03cb3a5bcf51c 100644 (file)
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -701,7 +701,6 @@ int usbtv_video_init(struct usbtv *usbtv)
        usbtv->vdev.tvnorms = USBTV_TV_STD;
        usbtv->vdev.queue = &usbtv->vb2q;
        usbtv->vdev.lock = &usbtv->v4l2_lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &usbtv->vdev.flags);
        video_set_drvdata(&usbtv->vdev, usbtv);
        ret = video_register_device(&usbtv->vdev, VFL_TYPE_GRABBER, -1);
        if (ret < 0) {

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index ad47c5cb539a6f56ce070180079267711c375df3..f8135f4e3b5262793e511193033d9b9bb9ad5abb 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1746,7 +1746,6 @@ static int uvc_register_video(struct uvc_device *dev,
        vdev->fops = &uvc_fops;
        vdev->release = uvc_release;
        vdev->prio = &stream->chain->prio;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
        if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
                vdev->vfl_dir = VFL_DIR_TX;
        strlcpy(vdev->name, dev->name, sizeof vdev->name);

diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
index 74d56df3347f59329ec6c4538023592c863bc1ac..3b80579a82c5dfc6703f5e411cd93432e2ef2afd 100644 (file)
--- a/drivers/media/usb/zr364xx/zr364xx.c
+++ b/drivers/media/usb/zr364xx/zr364xx.c
@@ -1456,7 +1456,6 @@ static int zr364xx_probe(struct usb_interface *intf,
        cam->vdev.lock = &cam->lock;
        cam->vdev.v4l2_dev = &cam->v4l2_dev;
        cam->vdev.ctrl_handler = &cam->ctrl_handler;
-       set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags);
        video_set_drvdata(&cam->vdev, cam);
        if (debug)
                cam->vdev.debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;

diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index d95c427043d43d5c3e898fbf2a45f1fba0ffbe9c..6f9171c39bdc8cc5ad270de4ac2c418bec877de8 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1606,7 +1606,6 @@ int vpfe_video_init(struct vpfe_video_device *video, const char *name)
        if (ret < 0)
                return ret;
 
-       set_bit(V4L2_FL_USE_FH_PRIO, &video->video_dev.flags);
        video_set_drvdata(&video->video_dev, video);
 
        return 0;

diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c
index da7b5493e13e31235a49107a7fe9f1a78021bb94..ecb5336d83797055c31e2b98d403ff9f212704f5 100644 (file)
--- a/drivers/staging/media/go7007/go7007-v4l2.c
+++ b/drivers/staging/media/go7007/go7007-v4l2.c
@@ -1001,7 +1001,6 @@ int go7007_v4l2_init(struct go7007 *go)
        *vdev = go7007_template;
        vdev->lock = &go->serialize_lock;
        vdev->queue = &go->vidq;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags);
        video_set_drvdata(vdev, go);
        vdev->v4l2_dev = &go->v4l2_dev;
        if (!v4l2_device_has_op(&go->v4l2_dev, video, querystd))

diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
index 08d0d096b8810532cc643b7355ce9187cd9923da..53aca380b28854c85c54b38aaee7654fa92f33d5 100644 (file)
--- a/drivers/staging/media/msi3101/sdr-msi3101.c
+++ b/drivers/staging/media/msi3101/sdr-msi3101.c
@@ -1418,7 +1418,6 @@ static int msi3101_probe(struct usb_interface *intf,
        s->vdev = msi3101_template;
        s->vdev.queue = &s->vb_queue;
        s->vdev.queue->lock = &s->vb_queue_lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev.flags);
        video_set_drvdata(&s->vdev, s);
 
        /* Register the v4l2_device structure */

diff --git a/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c b/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
index 4d2e30f525653e7d5234555a0158a0fb930ee7fa..cee127362b0b03f07c120219492f078b65e1166c 100644 (file)
--- a/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
+++ b/drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c
@@ -1480,7 +1480,6 @@ struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
        s->vdev = rtl2832_sdr_template;
        s->vdev.queue = &s->vb_queue;
        s->vdev.queue->lock = &s->vb_queue_lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev.flags);
        video_set_drvdata(&s->vdev, s);
 
        /* Register the v4l2_device structure */

diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
index b8ff113c20f4b582b7f8d1fbef129894de507a2a..bb2604ead21679bc2601dead15cb40e0cf9f89a8 100644 (file)
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
@@ -1326,7 +1326,6 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
        solo_enc->vfd->ctrl_handler = hdl;
        solo_enc->vfd->queue = &solo_enc->vidq;
        solo_enc->vfd->lock = &solo_enc->lock;
-       set_bit(V4L2_FL_USE_FH_PRIO, &solo_enc->vfd->flags);
        video_set_drvdata(solo_enc->vfd, solo_enc);
        ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr);
        if (ret < 0)

diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2.c b/drivers/staging/media/solo6x10/solo6x10-v4l2.c
index 5d0100eb38e641229b1dd4666b29ad6328409021..ba2526c883e978bf621972c03fc6d3281ff835b9 100644 (file)
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2.c
@@ -666,7 +666,6 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
                goto fail;
        }
        solo_dev->vfd->ctrl_handler = &solo_dev->disp_hdl;
-       set_bit(V4L2_FL_USE_FH_PRIO, &solo_dev->vfd->flags);
 
        video_set_drvdata(solo_dev->vfd, solo_dev);