diff options
Diffstat (limited to 'drivers')
62 files changed, 0 insertions, 64 deletions
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c index eda01bc68ab2..f2cc521e3743 100644 --- 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, | |||
613 | vfd->lock = &dev->v4l2_lock; | 613 | vfd->lock = &dev->v4l2_lock; |
614 | vfd->v4l2_dev = &dev->v4l2_dev; | 614 | vfd->v4l2_dev = &dev->v4l2_dev; |
615 | vfd->tvnorms = 0; | 615 | vfd->tvnorms = 0; |
616 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
617 | for (i = 0; i < dev->ext_vv_data->num_stds; i++) | 616 | for (i = 0; i < dev->ext_vv_data->num_stds; i++) |
618 | vfd->tvnorms |= dev->ext_vv_data->stds[i].id; | 617 | vfd->tvnorms |= dev->ext_vv_data->stds[i].id; |
619 | strlcpy(vfd->name, name, sizeof(vfd->name)); | 618 | strlcpy(vfd->name, name, sizeof(vfd->name)); |
diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c index 416507a83668..3c5dac4c1eab 100644 --- 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) | |||
990 | qcam->vdev.fops = &qcam_fops; | 990 | qcam->vdev.fops = &qcam_fops; |
991 | qcam->vdev.lock = &qcam->lock; | 991 | qcam->vdev.lock = &qcam->lock; |
992 | qcam->vdev.ioctl_ops = &qcam_ioctl_ops; | 992 | qcam->vdev.ioctl_ops = &qcam_ioctl_ops; |
993 | set_bit(V4L2_FL_USE_FH_PRIO, &qcam->vdev.flags); | ||
994 | qcam->vdev.release = video_device_release_empty; | 993 | qcam->vdev.release = video_device_release_empty; |
995 | video_set_drvdata(&qcam->vdev, qcam); | 994 | video_set_drvdata(&qcam->vdev, qcam); |
996 | 995 | ||
diff --git a/drivers/media/parport/c-qcam.c b/drivers/media/parport/c-qcam.c index ec51e1f12e82..b9010bd3ed3e 100644 --- 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) | |||
761 | qcam->vdev.ioctl_ops = &qcam_ioctl_ops; | 761 | qcam->vdev.ioctl_ops = &qcam_ioctl_ops; |
762 | qcam->vdev.release = video_device_release_empty; | 762 | qcam->vdev.release = video_device_release_empty; |
763 | qcam->vdev.ctrl_handler = &qcam->hdl; | 763 | qcam->vdev.ctrl_handler = &qcam->hdl; |
764 | set_bit(V4L2_FL_USE_FH_PRIO, &qcam->vdev.flags); | ||
765 | video_set_drvdata(&qcam->vdev, qcam); | 764 | video_set_drvdata(&qcam->vdev, qcam); |
766 | 765 | ||
767 | mutex_init(&qcam->lock); | 766 | mutex_init(&qcam->lock); |
diff --git a/drivers/media/parport/pms.c b/drivers/media/parport/pms.c index 66c957a02ba7..9bc105b3db1b 100644 --- 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) | |||
1091 | dev->vdev.release = video_device_release_empty; | 1091 | dev->vdev.release = video_device_release_empty; |
1092 | dev->vdev.lock = &dev->lock; | 1092 | dev->vdev.lock = &dev->lock; |
1093 | dev->vdev.tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM; | 1093 | dev->vdev.tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM; |
1094 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags); | ||
1095 | video_set_drvdata(&dev->vdev, dev); | 1094 | video_set_drvdata(&dev->vdev, dev); |
1096 | dev->std = V4L2_STD_NTSC_M; | 1095 | dev->std = V4L2_STD_NTSC_M; |
1097 | dev->height = 240; | 1096 | dev->height = 240; |
diff --git a/drivers/media/parport/w9966.c b/drivers/media/parport/w9966.c index db2a6003a1c3..f7502f3a6a3c 100644 --- 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) | |||
883 | cam->vdev.ioctl_ops = &w9966_ioctl_ops; | 883 | cam->vdev.ioctl_ops = &w9966_ioctl_ops; |
884 | cam->vdev.release = video_device_release_empty; | 884 | cam->vdev.release = video_device_release_empty; |
885 | cam->vdev.ctrl_handler = &cam->hdl; | 885 | cam->vdev.ctrl_handler = &cam->hdl; |
886 | set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags); | ||
887 | video_set_drvdata(&cam->vdev, cam); | 886 | video_set_drvdata(&cam->vdev, cam); |
888 | 887 | ||
889 | mutex_init(&cam->lock); | 888 | mutex_init(&cam->lock); |
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index da780f42b121..970e542d3a51 100644 --- 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, | |||
3886 | vfd->v4l2_dev = &btv->c.v4l2_dev; | 3886 | vfd->v4l2_dev = &btv->c.v4l2_dev; |
3887 | vfd->release = video_device_release; | 3887 | vfd->release = video_device_release; |
3888 | vfd->debug = bttv_debug; | 3888 | vfd->debug = bttv_debug; |
3889 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
3890 | video_set_drvdata(vfd, btv); | 3889 | video_set_drvdata(vfd, btv); |
3891 | snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)", | 3890 | snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)", |
3892 | btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "", | 3891 | 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 843c62b2f482..f3541b5156ce 100644 --- 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) | |||
375 | s->video_dev->release = video_device_release; | 375 | s->video_dev->release = video_device_release; |
376 | s->video_dev->tvnorms = V4L2_STD_ALL; | 376 | s->video_dev->tvnorms = V4L2_STD_ALL; |
377 | s->video_dev->lock = &cx->serialize_lock; | 377 | s->video_dev->lock = &cx->serialize_lock; |
378 | set_bit(V4L2_FL_USE_FH_PRIO, &s->video_dev->flags); | ||
379 | cx18_set_funcs(s->video_dev); | 378 | cx18_set_funcs(s->video_dev); |
380 | return 0; | 379 | return 0; |
381 | } | 380 | } |
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c index d270819fd875..8d2f1abeef77 100644 --- 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) | |||
1109 | else | 1109 | else |
1110 | vdev->vfl_dir = VFL_DIR_TX; | 1110 | vdev->vfl_dir = VFL_DIR_TX; |
1111 | vdev->lock = &dev->lock; | 1111 | vdev->lock = &dev->lock; |
1112 | set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags); | ||
1113 | snprintf(vdev->name, sizeof(vdev->name), "%s #%d", dev->name, i); | 1112 | snprintf(vdev->name, sizeof(vdev->name), "%s #%d", dev->name, i); |
1114 | video_set_drvdata(vdev, chan); | 1113 | video_set_drvdata(vdev, chan); |
1115 | 1114 | ||
diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c index e061c88b697e..71630238027b 100644 --- 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, | |||
1045 | vfd->release = video_device_release; | 1045 | vfd->release = video_device_release; |
1046 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", | 1046 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", |
1047 | core->name, type, core->board.name); | 1047 | core->name, type, core->board.name); |
1048 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
1049 | return vfd; | 1048 | return vfd; |
1050 | } | 1049 | } |
1051 | 1050 | ||
diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c index 70dad588a677..f0a1cc472313 100644 --- 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) | |||
251 | v4l2_disable_ioctl(s->vdev, VIDIOC_G_TUNER); | 251 | v4l2_disable_ioctl(s->vdev, VIDIOC_G_TUNER); |
252 | v4l2_disable_ioctl(s->vdev, VIDIOC_S_STD); | 252 | v4l2_disable_ioctl(s->vdev, VIDIOC_S_STD); |
253 | } | 253 | } |
254 | set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev->flags); | ||
255 | ivtv_set_funcs(s->vdev); | 254 | ivtv_set_funcs(s->vdev); |
256 | return 0; | 255 | return 0; |
257 | } | 256 | } |
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c index 54d5c821007c..1a77f8dfafa5 100644 --- 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) | |||
1749 | 1749 | ||
1750 | v4l2_ctrl_handler_setup(&meye.hdl); | 1750 | v4l2_ctrl_handler_setup(&meye.hdl); |
1751 | meye.vdev->ctrl_handler = &meye.hdl; | 1751 | meye.vdev->ctrl_handler = &meye.hdl; |
1752 | set_bit(V4L2_FL_USE_FH_PRIO, &meye.vdev->flags); | ||
1753 | 1752 | ||
1754 | if (video_register_device(meye.vdev, VFL_TYPE_GRABBER, | 1753 | if (video_register_device(meye.vdev, VFL_TYPE_GRABBER, |
1755 | video_nr) < 0) { | 1754 | video_nr) < 0) { |
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c index be19a051a492..9ff03a69ced4 100644 --- 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, | |||
811 | vfd->release = video_device_release; | 811 | vfd->release = video_device_release; |
812 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", | 812 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", |
813 | dev->name, type, saa7134_boards[dev->board].name); | 813 | dev->name, type, saa7134_boards[dev->board].name); |
814 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
815 | video_set_drvdata(vfd, dev); | 814 | video_set_drvdata(vfd, dev); |
816 | return vfd; | 815 | return vfd; |
817 | } | 816 | } |
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c index e65c760e4e8b..5526ed5444fb 100644 --- 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) | |||
270 | snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name), | 270 | snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name), |
271 | "%s empress (%s)", dev->name, | 271 | "%s empress (%s)", dev->name, |
272 | saa7134_boards[dev->board].name); | 272 | saa7134_boards[dev->board].name); |
273 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->empress_dev->flags); | ||
274 | v4l2_ctrl_handler_init(hdl, 21); | 273 | v4l2_ctrl_handler_init(hdl, 21); |
275 | v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter); | 274 | v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter); |
276 | if (dev->empress_sd) | 275 | if (dev->empress_sd) |
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c index d2abd3b5c2bf..f2d8c70d35f5 100644 --- 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, | |||
1093 | vip->video_dev = &video_dev_template; | 1093 | vip->video_dev = &video_dev_template; |
1094 | vip->video_dev->v4l2_dev = &vip->v4l2_dev; | 1094 | vip->video_dev->v4l2_dev = &vip->v4l2_dev; |
1095 | vip->video_dev->queue = &vip->vb_vidq; | 1095 | vip->video_dev->queue = &vip->vb_vidq; |
1096 | set_bit(V4L2_FL_USE_FH_PRIO, &vip->video_dev->flags); | ||
1097 | video_set_drvdata(vip->video_dev, vip); | 1096 | video_set_drvdata(vip->video_dev, vip); |
1098 | 1097 | ||
1099 | ret = video_register_device(vip->video_dev, VFL_TYPE_GRABBER, -1); | 1098 | 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 e9410e41ae0c..03c5098499c4 100644 --- a/drivers/media/platform/arv.c +++ b/drivers/media/platform/arv.c | |||
@@ -773,7 +773,6 @@ static int __init ar_init(void) | |||
773 | ar->vdev.fops = &ar_fops; | 773 | ar->vdev.fops = &ar_fops; |
774 | ar->vdev.ioctl_ops = &ar_ioctl_ops; | 774 | ar->vdev.ioctl_ops = &ar_ioctl_ops; |
775 | ar->vdev.release = video_device_release_empty; | 775 | ar->vdev.release = video_device_release_empty; |
776 | set_bit(V4L2_FL_USE_FH_PRIO, &ar->vdev.flags); | ||
777 | video_set_drvdata(&ar->vdev, ar); | 776 | video_set_drvdata(&ar->vdev, ar); |
778 | 777 | ||
779 | if (vga) { | 778 | if (vga) { |
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 16e4b1c525c4..6ef986657dda 100644 --- 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) | |||
966 | vfd->ioctl_ops = &bcap_ioctl_ops; | 966 | vfd->ioctl_ops = &bcap_ioctl_ops; |
967 | vfd->tvnorms = 0; | 967 | vfd->tvnorms = 0; |
968 | vfd->v4l2_dev = &bcap_dev->v4l2_dev; | 968 | vfd->v4l2_dev = &bcap_dev->v4l2_dev; |
969 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
970 | strncpy(vfd->name, CAPTURE_DRV_NAME, sizeof(vfd->name)); | 969 | strncpy(vfd->name, CAPTURE_DRV_NAME, sizeof(vfd->name)); |
971 | bcap_dev->video_dev = vfd; | 970 | bcap_dev->video_dev = vfd; |
972 | 971 | ||
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index bf5eff99452b..73496d953ba0 100644 --- 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, | |||
1709 | vpbe_display_layer->disp_dev = disp_dev; | 1709 | vpbe_display_layer->disp_dev = disp_dev; |
1710 | /* set the driver data in platform device */ | 1710 | /* set the driver data in platform device */ |
1711 | platform_set_drvdata(pdev, disp_dev); | 1711 | platform_set_drvdata(pdev, disp_dev); |
1712 | set_bit(V4L2_FL_USE_FH_PRIO, &vpbe_display_layer->video_dev.flags); | ||
1713 | video_set_drvdata(&vpbe_display_layer->video_dev, | 1712 | video_set_drvdata(&vpbe_display_layer->video_dev, |
1714 | vpbe_display_layer); | 1713 | vpbe_display_layer); |
1715 | 1714 | ||
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index a51bda2fb637..ea7661a27479 100644 --- 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) | |||
1916 | v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, | 1916 | v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, |
1917 | "video_dev=%x\n", (int)&vpfe_dev->video_dev); | 1917 | "video_dev=%x\n", (int)&vpfe_dev->video_dev); |
1918 | vpfe_dev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | 1918 | vpfe_dev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; |
1919 | set_bit(V4L2_FL_USE_FH_PRIO, &vpfe_dev->video_dev->flags); | ||
1920 | ret = video_register_device(vpfe_dev->video_dev, | 1919 | ret = video_register_device(vpfe_dev->video_dev, |
1921 | VFL_TYPE_GRABBER, -1); | 1920 | VFL_TYPE_GRABBER, -1); |
1922 | 1921 | ||
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index ee0a5fcecbe4..2f90f0d98ad5 100644 --- 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) | |||
1397 | vdev->vfl_dir = VFL_DIR_RX; | 1397 | vdev->vfl_dir = VFL_DIR_RX; |
1398 | vdev->queue = q; | 1398 | vdev->queue = q; |
1399 | vdev->lock = &common->lock; | 1399 | vdev->lock = &common->lock; |
1400 | set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags); | ||
1401 | video_set_drvdata(ch->video_dev, ch); | 1400 | video_set_drvdata(ch->video_dev, ch); |
1402 | err = video_register_device(vdev, | 1401 | err = video_register_device(vdev, |
1403 | VFL_TYPE_GRABBER, (j ? 1 : 0)); | 1402 | 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 5bb085b19bcb..877b46e8b2e4 100644 --- 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) | |||
1223 | vdev->vfl_dir = VFL_DIR_TX; | 1223 | vdev->vfl_dir = VFL_DIR_TX; |
1224 | vdev->queue = q; | 1224 | vdev->queue = q; |
1225 | vdev->lock = &common->lock; | 1225 | vdev->lock = &common->lock; |
1226 | set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags); | ||
1227 | video_set_drvdata(ch->video_dev, ch); | 1226 | video_set_drvdata(ch->video_dev, ch); |
1228 | err = video_register_device(vdev, VFL_TYPE_GRABBER, | 1227 | err = video_register_device(vdev, VFL_TYPE_GRABBER, |
1229 | (j ? 3 : 2)); | 1228 | (j ? 3 : 2)); |
diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c index deba425e3d8f..8ea520935867 100644 --- 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) | |||
1172 | goto err_vd_rel; | 1172 | goto err_vd_rel; |
1173 | 1173 | ||
1174 | video_set_drvdata(vfd, vp); | 1174 | video_set_drvdata(vfd, vp); |
1175 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
1176 | 1175 | ||
1177 | v4l2_ctrl_handler_init(&vp->ctrl_handler, 1); | 1176 | v4l2_ctrl_handler_init(&vp->ctrl_handler, 1); |
1178 | ctrl = v4l2_ctrl_new_std(&vp->ctrl_handler, &s3c_camif_video_ctrl_ops, | 1177 | 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 8a8dbc8fdfde..b4d2696501e4 100644 --- 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, | |||
1109 | .ioctl_ops = &mxr_ioctl_ops, | 1109 | .ioctl_ops = &mxr_ioctl_ops, |
1110 | }; | 1110 | }; |
1111 | strlcpy(layer->vfd.name, name, sizeof(layer->vfd.name)); | 1111 | strlcpy(layer->vfd.name, name, sizeof(layer->vfd.name)); |
1112 | /* let framework control PRIORITY */ | ||
1113 | set_bit(V4L2_FL_USE_FH_PRIO, &layer->vfd.flags); | ||
1114 | 1112 | ||
1115 | video_set_drvdata(&layer->vfd, layer); | 1113 | video_set_drvdata(&layer->vfd, layer); |
1116 | layer->vfd.lock = &layer->mutex; | 1114 | layer->vfd.lock = &layer->mutex; |
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c index d00bf3df0f8a..b7fbcdfc5862 100644 --- a/drivers/media/platform/vivi.c +++ b/drivers/media/platform/vivi.c | |||
@@ -1459,7 +1459,6 @@ static int __init vivi_create_instance(int inst) | |||
1459 | vfd->debug = debug; | 1459 | vfd->debug = debug; |
1460 | vfd->v4l2_dev = &dev->v4l2_dev; | 1460 | vfd->v4l2_dev = &dev->v4l2_dev; |
1461 | vfd->queue = q; | 1461 | vfd->queue = q; |
1462 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
1463 | 1462 | ||
1464 | /* | 1463 | /* |
1465 | * Provide a mutex to v4l2 core. It will be used to protect | 1464 | * 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 142c2ee64d31..2262b8139ca1 100644 --- 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, | |||
390 | radio->videodev.release = video_device_release_empty; | 390 | radio->videodev.release = video_device_release_empty; |
391 | radio->videodev.lock = &radio->v4l2_lock; | 391 | radio->videodev.lock = &radio->v4l2_lock; |
392 | radio->videodev.ctrl_handler = &radio->hdl; | 392 | radio->videodev.ctrl_handler = &radio->hdl; |
393 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags); | ||
394 | 393 | ||
395 | radio->usbdev = interface_to_usbdev(intf); | 394 | radio->usbdev = interface_to_usbdev(intf); |
396 | radio->curfreq = FREQ_MIN * FREQ_MUL; | 395 | radio->curfreq = FREQ_MIN * FREQ_MUL; |
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index d719e59e2179..82affaedf067 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
@@ -650,7 +650,6 @@ static int __init cadet_init(void) | |||
650 | dev->vdev.ioctl_ops = &cadet_ioctl_ops; | 650 | dev->vdev.ioctl_ops = &cadet_ioctl_ops; |
651 | dev->vdev.release = video_device_release_empty; | 651 | dev->vdev.release = video_device_release_empty; |
652 | dev->vdev.lock = &dev->lock; | 652 | dev->vdev.lock = &dev->lock; |
653 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags); | ||
654 | video_set_drvdata(&dev->vdev, dev); | 653 | video_set_drvdata(&dev->vdev, dev); |
655 | 654 | ||
656 | res = video_register_device(&dev->vdev, VFL_TYPE_RADIO, radio_nr); | 655 | 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 6ff350831d56..c309ee45a08e 100644 --- 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, | |||
253 | isa->vdev.fops = &radio_isa_fops; | 253 | isa->vdev.fops = &radio_isa_fops; |
254 | isa->vdev.ioctl_ops = &radio_isa_ioctl_ops; | 254 | isa->vdev.ioctl_ops = &radio_isa_ioctl_ops; |
255 | isa->vdev.release = video_device_release_empty; | 255 | isa->vdev.release = video_device_release_empty; |
256 | set_bit(V4L2_FL_USE_FH_PRIO, &isa->vdev.flags); | ||
257 | video_set_drvdata(&isa->vdev, isa); | 256 | video_set_drvdata(&isa->vdev, isa); |
258 | isa->freq = FREQ_LOW; | 257 | isa->freq = FREQ_LOW; |
259 | isa->stereo = drv->has_stereo; | 258 | isa->stereo = drv->has_stereo; |
diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c index 3d127825eceb..67ac72e66850 100644 --- 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, | |||
380 | usb_set_intfdata(intf, &radio->v4l2_dev); | 380 | usb_set_intfdata(intf, &radio->v4l2_dev); |
381 | 381 | ||
382 | video_set_drvdata(&radio->vdev, radio); | 382 | video_set_drvdata(&radio->vdev, radio); |
383 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); | ||
384 | 383 | ||
385 | /* at least 11ms is needed in order to settle hardware */ | 384 | /* at least 11ms is needed in order to settle hardware */ |
386 | msleep(20); | 385 | msleep(20); |
diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c index a85b064cb7be..b3000ef85ee7 100644 --- 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, | |||
411 | radio->vdev.ioctl_ops = &usb_ma901radio_ioctl_ops; | 411 | radio->vdev.ioctl_ops = &usb_ma901radio_ioctl_ops; |
412 | radio->vdev.release = video_device_release_empty; | 412 | radio->vdev.release = video_device_release_empty; |
413 | radio->vdev.lock = &radio->lock; | 413 | radio->vdev.lock = &radio->lock; |
414 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); | ||
415 | 414 | ||
416 | radio->usbdev = interface_to_usbdev(intf); | 415 | radio->usbdev = interface_to_usbdev(intf); |
417 | radio->intf = intf; | 416 | radio->intf = intf; |
diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c index a7e93d7477dd..3d12edf520a0 100644 --- a/drivers/media/radio/radio-miropcm20.c +++ b/drivers/media/radio/radio-miropcm20.c | |||
@@ -210,7 +210,6 @@ static int __init pcm20_init(void) | |||
210 | dev->vdev.ioctl_ops = &pcm20_ioctl_ops; | 210 | dev->vdev.ioctl_ops = &pcm20_ioctl_ops; |
211 | dev->vdev.release = video_device_release_empty; | 211 | dev->vdev.release = video_device_release_empty; |
212 | dev->vdev.lock = &dev->lock; | 212 | dev->vdev.lock = &dev->lock; |
213 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags); | ||
214 | video_set_drvdata(&dev->vdev, dev); | 213 | video_set_drvdata(&dev->vdev, dev); |
215 | snd_aci_cmd(dev->aci, ACI_SET_TUNERMONO, | 214 | snd_aci_cmd(dev->aci, ACI_SET_TUNERMONO, |
216 | dev->audmode == V4L2_TUNER_MODE_MONO, -1); | 215 | dev->audmode == V4L2_TUNER_MODE_MONO, -1); |
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index f47607163acb..c2927fd12615 100644 --- 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, | |||
558 | radio->vdev.ioctl_ops = &usb_amradio_ioctl_ops; | 558 | radio->vdev.ioctl_ops = &usb_amradio_ioctl_ops; |
559 | radio->vdev.release = video_device_release_empty; | 559 | radio->vdev.release = video_device_release_empty; |
560 | radio->vdev.lock = &radio->lock; | 560 | radio->vdev.lock = &radio->lock; |
561 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); | ||
562 | 561 | ||
563 | radio->usbdev = interface_to_usbdev(intf); | 562 | radio->usbdev = interface_to_usbdev(intf); |
564 | radio->intf = intf; | 563 | radio->intf = intf; |
diff --git a/drivers/media/radio/radio-raremono.c b/drivers/media/radio/radio-raremono.c index 7b3bdbb1be73..bfb3a6d051ba 100644 --- 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, | |||
361 | usb_set_intfdata(intf, &radio->v4l2_dev); | 361 | usb_set_intfdata(intf, &radio->v4l2_dev); |
362 | 362 | ||
363 | video_set_drvdata(&radio->vdev, radio); | 363 | video_set_drvdata(&radio->vdev, radio); |
364 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); | ||
365 | 364 | ||
366 | raremono_cmd_main(radio, BAND_FM, 95160); | 365 | raremono_cmd_main(radio, BAND_FM, 95160); |
367 | 366 | ||
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 6f4318ff0db3..d7ce8fe6b5ae 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
@@ -344,7 +344,6 @@ static int __init fmi_init(void) | |||
344 | fmi->vdev.fops = &fmi_fops; | 344 | fmi->vdev.fops = &fmi_fops; |
345 | fmi->vdev.ioctl_ops = &fmi_ioctl_ops; | 345 | fmi->vdev.ioctl_ops = &fmi_ioctl_ops; |
346 | fmi->vdev.release = video_device_release_empty; | 346 | fmi->vdev.release = video_device_release_empty; |
347 | set_bit(V4L2_FL_USE_FH_PRIO, &fmi->vdev.flags); | ||
348 | video_set_drvdata(&fmi->vdev, fmi); | 347 | video_set_drvdata(&fmi->vdev, fmi); |
349 | 348 | ||
350 | mutex_init(&fmi->lock); | 349 | mutex_init(&fmi->lock); |
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c index 2fd9009f8663..633022b45f33 100644 --- 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) | |||
1470 | video_set_drvdata(&radio->videodev, radio); | 1470 | video_set_drvdata(&radio->videodev, radio); |
1471 | platform_set_drvdata(pdev, radio); | 1471 | platform_set_drvdata(pdev, radio); |
1472 | 1472 | ||
1473 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags); | ||
1474 | 1473 | ||
1475 | radio->v4l2dev.ctrl_handler = &radio->ctrl_handler; | 1474 | radio->v4l2dev.ctrl_handler = &radio->ctrl_handler; |
1476 | v4l2_ctrl_handler_init(&radio->ctrl_handler, | 1475 | v4l2_ctrl_handler_init(&radio->ctrl_handler, |
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c index 3ed1f5669f79..925049654c5b 100644 --- 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, | |||
478 | video_set_drvdata(&radio->vdev, radio); | 478 | video_set_drvdata(&radio->vdev, radio); |
479 | radio->vdev.lock = &radio->mutex; | 479 | radio->vdev.lock = &radio->mutex; |
480 | radio->vdev.v4l2_dev = v4l2_dev; | 480 | radio->vdev.v4l2_dev = v4l2_dev; |
481 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); | ||
482 | 481 | ||
483 | /* initialize and power off the chip */ | 482 | /* initialize and power off the chip */ |
484 | tea5764_i2c_read(radio); | 483 | tea5764_i2c_read(radio); |
diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c index e2455970725a..83fe7ab358df 100644 --- 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) | |||
570 | tea->fops = tea575x_fops; | 570 | tea->fops = tea575x_fops; |
571 | tea->fops.owner = owner; | 571 | tea->fops.owner = owner; |
572 | tea->vd.fops = &tea->fops; | 572 | tea->vd.fops = &tea->fops; |
573 | set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags); | ||
574 | 573 | ||
575 | tea->vd.ctrl_handler = &tea->ctrl_handler; | 574 | tea->vd.ctrl_handler = &tea->ctrl_handler; |
576 | v4l2_ctrl_handler_init(&tea->ctrl_handler, 1); | 575 | 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 0817964d9172..b9285e6584af 100644 --- 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) | |||
126 | tr->video_dev.release = video_device_release_empty; | 126 | tr->video_dev.release = video_device_release_empty; |
127 | tr->video_dev.minor = -1; | 127 | tr->video_dev.minor = -1; |
128 | tr->video_dev.lock = &tr->lock; | 128 | tr->video_dev.lock = &tr->lock; |
129 | set_bit(V4L2_FL_USE_FH_PRIO, &tr->video_dev.flags); | ||
130 | 129 | ||
131 | strlcpy(tr->v4l2_dev.name, DRIVER_NAME, sizeof(tr->v4l2_dev.name)); | 130 | strlcpy(tr->v4l2_dev.name, DRIVER_NAME, sizeof(tr->v4l2_dev.name)); |
132 | err = v4l2_device_register(NULL, &tr->v4l2_dev); | 131 | 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 07ef40595efd..494fac061306 100644 --- 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, | |||
680 | radio->videodev.lock = &radio->lock; | 680 | radio->videodev.lock = &radio->lock; |
681 | radio->videodev.v4l2_dev = &radio->v4l2_dev; | 681 | radio->videodev.v4l2_dev = &radio->v4l2_dev; |
682 | radio->videodev.release = video_device_release_empty; | 682 | radio->videodev.release = video_device_release_empty; |
683 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->videodev.flags); | ||
684 | video_set_drvdata(&radio->videodev, radio); | 683 | video_set_drvdata(&radio->videodev, radio); |
685 | 684 | ||
686 | /* get device and chip versions */ | 685 | /* 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 ba4cfc946868..a47502a330f0 100644 --- 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) | |||
196 | rsdev->radio_dev = radio_si4713_vdev_template; | 196 | rsdev->radio_dev = radio_si4713_vdev_template; |
197 | rsdev->radio_dev.v4l2_dev = &rsdev->v4l2_dev; | 197 | rsdev->radio_dev.v4l2_dev = &rsdev->v4l2_dev; |
198 | rsdev->radio_dev.ctrl_handler = sd->ctrl_handler; | 198 | rsdev->radio_dev.ctrl_handler = sd->ctrl_handler; |
199 | set_bit(V4L2_FL_USE_FH_PRIO, &rsdev->radio_dev.flags); | ||
200 | /* Serialize all access to the si4713 */ | 199 | /* Serialize all access to the si4713 */ |
201 | rsdev->radio_dev.lock = &rsdev->lock; | 200 | rsdev->radio_dev.lock = &rsdev->lock; |
202 | video_set_drvdata(&rsdev->radio_dev, rsdev); | 201 | 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 86502b2786d0..a77319dcba05 100644 --- 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, | |||
492 | radio->vdev.vfl_dir = VFL_DIR_TX; | 492 | radio->vdev.vfl_dir = VFL_DIR_TX; |
493 | 493 | ||
494 | video_set_drvdata(&radio->vdev, radio); | 494 | video_set_drvdata(&radio->vdev, radio); |
495 | set_bit(V4L2_FL_USE_FH_PRIO, &radio->vdev.flags); | ||
496 | 495 | ||
497 | retval = video_register_device(&radio->vdev, VFL_TYPE_RADIO, -1); | 496 | retval = video_register_device(&radio->vdev, VFL_TYPE_RADIO, -1); |
498 | if (retval < 0) { | 497 | if (retval < 0) { |
diff --git a/drivers/media/radio/tea575x.c b/drivers/media/radio/tea575x.c index 7c14060a40b8..f1a0867789fe 100644 --- 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) | |||
523 | tea->fops = tea575x_fops; | 523 | tea->fops = tea575x_fops; |
524 | tea->fops.owner = owner; | 524 | tea->fops.owner = owner; |
525 | tea->vd.fops = &tea->fops; | 525 | tea->vd.fops = &tea->fops; |
526 | set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags); | ||
527 | /* disable hw_freq_seek if we can't use it */ | 526 | /* disable hw_freq_seek if we can't use it */ |
528 | if (tea->cannot_read_data) | 527 | if (tea->cannot_read_data) |
529 | v4l2_disable_ioctl(&tea->vd, VIDIOC_S_HW_FREQ_SEEK); | 528 | 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 385894a1ff68..98f7ea1d6d63 100644 --- 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, | |||
2016 | *dev->vdev = au0828_video_template; | 2016 | *dev->vdev = au0828_video_template; |
2017 | dev->vdev->v4l2_dev = &dev->v4l2_dev; | 2017 | dev->vdev->v4l2_dev = &dev->v4l2_dev; |
2018 | dev->vdev->lock = &dev->lock; | 2018 | dev->vdev->lock = &dev->lock; |
2019 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev->flags); | ||
2020 | strcpy(dev->vdev->name, "au0828a video"); | 2019 | strcpy(dev->vdev->name, "au0828a video"); |
2021 | 2020 | ||
2022 | /* Setup the VBI device */ | 2021 | /* Setup the VBI device */ |
2023 | *dev->vbi_dev = au0828_video_template; | 2022 | *dev->vbi_dev = au0828_video_template; |
2024 | dev->vbi_dev->v4l2_dev = &dev->v4l2_dev; | 2023 | dev->vbi_dev->v4l2_dev = &dev->v4l2_dev; |
2025 | dev->vbi_dev->lock = &dev->lock; | 2024 | dev->vbi_dev->lock = &dev->lock; |
2026 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vbi_dev->flags); | ||
2027 | strcpy(dev->vbi_dev->name, "au0828a vbi"); | 2025 | strcpy(dev->vbi_dev->name, "au0828a vbi"); |
2028 | 2026 | ||
2029 | /* Register the v4l2 device */ | 2027 | /* Register the v4l2 device */ |
diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c index d5d42b6e94be..9caea8344547 100644 --- 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) | |||
1169 | cam->vdev.lock = &cam->v4l2_lock; | 1169 | cam->vdev.lock = &cam->v4l2_lock; |
1170 | cam->vdev.ctrl_handler = hdl; | 1170 | cam->vdev.ctrl_handler = hdl; |
1171 | cam->vdev.v4l2_dev = &cam->v4l2_dev; | 1171 | cam->vdev.v4l2_dev = &cam->v4l2_dev; |
1172 | set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags); | ||
1173 | 1172 | ||
1174 | reset_camera_struct_v4l(cam); | 1173 | reset_camera_struct_v4l(cam); |
1175 | 1174 | ||
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index 30a0c69fb42f..f0400e260eb7 100644 --- 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( | |||
1923 | vfd->v4l2_dev = &dev->v4l2_dev; | 1923 | vfd->v4l2_dev = &dev->v4l2_dev; |
1924 | vfd->lock = &dev->lock; | 1924 | vfd->lock = &dev->lock; |
1925 | vfd->release = video_device_release; | 1925 | vfd->release = video_device_release; |
1926 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
1927 | vfd->ctrl_handler = &dev->mpeg_ctrl_handler.hdl; | 1926 | vfd->ctrl_handler = &dev->mpeg_ctrl_handler.hdl; |
1928 | video_set_drvdata(vfd, dev); | 1927 | video_set_drvdata(vfd, dev); |
1929 | if (dev->tuner_type == TUNER_ABSENT) { | 1928 | 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 cba7fea3c6cd..ae31ca2fc9a1 100644 --- 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, | |||
2065 | vfd->release = video_device_release; | 2065 | vfd->release = video_device_release; |
2066 | vfd->debug = video_debug; | 2066 | vfd->debug = video_debug; |
2067 | vfd->lock = &dev->lock; | 2067 | vfd->lock = &dev->lock; |
2068 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
2069 | 2068 | ||
2070 | snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); | 2069 | snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); |
2071 | 2070 | ||
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index f6b49c98e2c9..3f8b5aa7669a 100644 --- 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, | |||
2208 | vfd->v4l2_dev = &dev->v4l2->v4l2_dev; | 2208 | vfd->v4l2_dev = &dev->v4l2->v4l2_dev; |
2209 | vfd->debug = video_debug; | 2209 | vfd->debug = video_debug; |
2210 | vfd->lock = &dev->lock; | 2210 | vfd->lock = &dev->lock; |
2211 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
2212 | if (dev->board.is_webcam) | 2211 | if (dev->board.is_webcam) |
2213 | vfd->tvnorms = 0; | 2212 | vfd->tvnorms = 0; |
2214 | 2213 | ||
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index f9a75adcf637..42d223239206 100644 --- 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, | |||
2066 | gspca_dev->vdev = gspca_template; | 2066 | gspca_dev->vdev = gspca_template; |
2067 | gspca_dev->vdev.v4l2_dev = &gspca_dev->v4l2_dev; | 2067 | gspca_dev->vdev.v4l2_dev = &gspca_dev->v4l2_dev; |
2068 | video_set_drvdata(&gspca_dev->vdev, gspca_dev); | 2068 | video_set_drvdata(&gspca_dev->vdev, gspca_dev); |
2069 | set_bit(V4L2_FL_USE_FH_PRIO, &gspca_dev->vdev.flags); | ||
2070 | gspca_dev->module = module; | 2069 | gspca_dev->module = module; |
2071 | gspca_dev->present = 1; | 2070 | gspca_dev->present = 1; |
2072 | 2071 | ||
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index 0500c4175d5f..dca4b65053aa 100644 --- 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, | |||
1240 | strcpy(dev->video_dev->name, "Hauppauge HD PVR"); | 1240 | strcpy(dev->video_dev->name, "Hauppauge HD PVR"); |
1241 | dev->video_dev->v4l2_dev = &dev->v4l2_dev; | 1241 | dev->video_dev->v4l2_dev = &dev->v4l2_dev; |
1242 | video_set_drvdata(dev->video_dev, dev); | 1242 | video_set_drvdata(dev->video_dev, dev); |
1243 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->video_dev->flags); | ||
1244 | 1243 | ||
1245 | res = video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum); | 1244 | res = video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum); |
1246 | if (res < 0) { | 1245 | if (res < 0) { |
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index a73b0bced96f..15b754da4a2c 100644 --- 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 | |||
1013 | strcpy(pdev->vdev.name, name); | 1013 | strcpy(pdev->vdev.name, name); |
1014 | pdev->vdev.queue = &pdev->vb_queue; | 1014 | pdev->vdev.queue = &pdev->vb_queue; |
1015 | pdev->vdev.queue->lock = &pdev->vb_queue_lock; | 1015 | pdev->vdev.queue->lock = &pdev->vb_queue_lock; |
1016 | set_bit(V4L2_FL_USE_FH_PRIO, &pdev->vdev.flags); | ||
1017 | video_set_drvdata(&pdev->vdev, pdev); | 1016 | video_set_drvdata(&pdev->vdev, pdev); |
1018 | 1017 | ||
1019 | pdev->release = le16_to_cpu(udev->descriptor.bcdDevice); | 1018 | 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 a44466bc7b86..2c901861034a 100644 --- 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) | |||
1676 | vc->vdev.ctrl_handler = &vc->hdl; | 1676 | vc->vdev.ctrl_handler = &vc->hdl; |
1677 | vc->vdev.lock = &dev->lock; | 1677 | vc->vdev.lock = &dev->lock; |
1678 | vc->vdev.v4l2_dev = &dev->v4l2_dev; | 1678 | vc->vdev.v4l2_dev = &dev->v4l2_dev; |
1679 | set_bit(V4L2_FL_USE_FH_PRIO, &vc->vdev.flags); | ||
1680 | video_set_drvdata(&vc->vdev, vc); | 1679 | video_set_drvdata(&vc->vdev, vc); |
1681 | if (video_nr == -1) | 1680 | if (video_nr == -1) |
1682 | ret = video_register_device(&vc->vdev, | 1681 | 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 5461341a31cb..233054311a62 100644 --- 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) | |||
671 | 671 | ||
672 | /* This will be used to set video_device parent */ | 672 | /* This will be used to set video_device parent */ |
673 | dev->vdev.v4l2_dev = &dev->v4l2_dev; | 673 | dev->vdev.v4l2_dev = &dev->v4l2_dev; |
674 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags); | ||
675 | 674 | ||
676 | /* NTSC is default */ | 675 | /* NTSC is default */ |
677 | dev->norm = V4L2_STD_NTSC_M; | 676 | 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 be77482c3070..d76860b6a0b8 100644 --- 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) | |||
1266 | dev->vdev.lock = &dev->lock; | 1266 | dev->vdev.lock = &dev->lock; |
1267 | dev->vdev.debug = debug; | 1267 | dev->vdev.debug = debug; |
1268 | dev->vdev.v4l2_dev = &dev->v4l2_dev; | 1268 | dev->vdev.v4l2_dev = &dev->v4l2_dev; |
1269 | set_bit(V4L2_FL_USE_FH_PRIO, &dev->vdev.flags); | ||
1270 | video_set_drvdata(&dev->vdev, dev); | 1269 | video_set_drvdata(&dev->vdev, dev); |
1271 | err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1); | 1270 | err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1); |
1272 | if (err) | 1271 | if (err) |
diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c index ea6070ba835e..b391194a840c 100644 --- 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) | |||
327 | } | 327 | } |
328 | vfd->v4l2_dev = &p->v4l2_dev; | 328 | vfd->v4l2_dev = &p->v4l2_dev; |
329 | vfd->ctrl_handler = hdl; | 329 | vfd->ctrl_handler = hdl; |
330 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
331 | video_set_drvdata(vfd, p); | 330 | video_set_drvdata(vfd, p); |
332 | return video_register_device(vfd, VFL_TYPE_RADIO, -1); | 331 | return video_register_device(vfd, VFL_TYPE_RADIO, -1); |
333 | } | 332 | } |
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c index e6b3d5d83d43..9bde0642ffd1 100644 --- 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, | |||
1626 | vfd->release = video_device_release; | 1626 | vfd->release = video_device_release; |
1627 | vfd->debug = tm6000_debug; | 1627 | vfd->debug = tm6000_debug; |
1628 | vfd->lock = &dev->lock; | 1628 | vfd->lock = &dev->lock; |
1629 | set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); | ||
1630 | 1629 | ||
1631 | snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); | 1630 | snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); |
1632 | 1631 | ||
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c index 2967e808408b..030c5854b4b3 100644 --- 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) | |||
701 | usbtv->vdev.tvnorms = USBTV_TV_STD; | 701 | usbtv->vdev.tvnorms = USBTV_TV_STD; |
702 | usbtv->vdev.queue = &usbtv->vb2q; | 702 | usbtv->vdev.queue = &usbtv->vb2q; |
703 | usbtv->vdev.lock = &usbtv->v4l2_lock; | 703 | usbtv->vdev.lock = &usbtv->v4l2_lock; |
704 | set_bit(V4L2_FL_USE_FH_PRIO, &usbtv->vdev.flags); | ||
705 | video_set_drvdata(&usbtv->vdev, usbtv); | 704 | video_set_drvdata(&usbtv->vdev, usbtv); |
706 | ret = video_register_device(&usbtv->vdev, VFL_TYPE_GRABBER, -1); | 705 | ret = video_register_device(&usbtv->vdev, VFL_TYPE_GRABBER, -1); |
707 | if (ret < 0) { | 706 | if (ret < 0) { |
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index ad47c5cb539a..f8135f4e3b52 100644 --- 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, | |||
1746 | vdev->fops = &uvc_fops; | 1746 | vdev->fops = &uvc_fops; |
1747 | vdev->release = uvc_release; | 1747 | vdev->release = uvc_release; |
1748 | vdev->prio = &stream->chain->prio; | 1748 | vdev->prio = &stream->chain->prio; |
1749 | set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags); | ||
1750 | if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) | 1749 | if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) |
1751 | vdev->vfl_dir = VFL_DIR_TX; | 1750 | vdev->vfl_dir = VFL_DIR_TX; |
1752 | strlcpy(vdev->name, dev->name, sizeof vdev->name); | 1751 | 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 74d56df3347f..3b80579a82c5 100644 --- 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, | |||
1456 | cam->vdev.lock = &cam->lock; | 1456 | cam->vdev.lock = &cam->lock; |
1457 | cam->vdev.v4l2_dev = &cam->v4l2_dev; | 1457 | cam->vdev.v4l2_dev = &cam->v4l2_dev; |
1458 | cam->vdev.ctrl_handler = &cam->ctrl_handler; | 1458 | cam->vdev.ctrl_handler = &cam->ctrl_handler; |
1459 | set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags); | ||
1460 | video_set_drvdata(&cam->vdev, cam); | 1459 | video_set_drvdata(&cam->vdev, cam); |
1461 | if (debug) | 1460 | if (debug) |
1462 | cam->vdev.debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG; | 1461 | 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 d95c427043d4..6f9171c39bdc 100644 --- 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) | |||
1606 | if (ret < 0) | 1606 | if (ret < 0) |
1607 | return ret; | 1607 | return ret; |
1608 | 1608 | ||
1609 | set_bit(V4L2_FL_USE_FH_PRIO, &video->video_dev.flags); | ||
1610 | video_set_drvdata(&video->video_dev, video); | 1609 | video_set_drvdata(&video->video_dev, video); |
1611 | 1610 | ||
1612 | return 0; | 1611 | return 0; |
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index da7b5493e13e..ecb5336d8379 100644 --- 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) | |||
1001 | *vdev = go7007_template; | 1001 | *vdev = go7007_template; |
1002 | vdev->lock = &go->serialize_lock; | 1002 | vdev->lock = &go->serialize_lock; |
1003 | vdev->queue = &go->vidq; | 1003 | vdev->queue = &go->vidq; |
1004 | set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags); | ||
1005 | video_set_drvdata(vdev, go); | 1004 | video_set_drvdata(vdev, go); |
1006 | vdev->v4l2_dev = &go->v4l2_dev; | 1005 | vdev->v4l2_dev = &go->v4l2_dev; |
1007 | if (!v4l2_device_has_op(&go->v4l2_dev, video, querystd)) | 1006 | 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 08d0d096b881..53aca380b288 100644 --- 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, | |||
1418 | s->vdev = msi3101_template; | 1418 | s->vdev = msi3101_template; |
1419 | s->vdev.queue = &s->vb_queue; | 1419 | s->vdev.queue = &s->vb_queue; |
1420 | s->vdev.queue->lock = &s->vb_queue_lock; | 1420 | s->vdev.queue->lock = &s->vb_queue_lock; |
1421 | set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev.flags); | ||
1422 | video_set_drvdata(&s->vdev, s); | 1421 | video_set_drvdata(&s->vdev, s); |
1423 | 1422 | ||
1424 | /* Register the v4l2_device structure */ | 1423 | /* 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 4d2e30f52565..cee127362b0b 100644 --- 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, | |||
1480 | s->vdev = rtl2832_sdr_template; | 1480 | s->vdev = rtl2832_sdr_template; |
1481 | s->vdev.queue = &s->vb_queue; | 1481 | s->vdev.queue = &s->vb_queue; |
1482 | s->vdev.queue->lock = &s->vb_queue_lock; | 1482 | s->vdev.queue->lock = &s->vb_queue_lock; |
1483 | set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev.flags); | ||
1484 | video_set_drvdata(&s->vdev, s); | 1483 | video_set_drvdata(&s->vdev, s); |
1485 | 1484 | ||
1486 | /* Register the v4l2_device structure */ | 1485 | /* 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 b8ff113c20f4..bb2604ead216 100644 --- 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, | |||
1326 | solo_enc->vfd->ctrl_handler = hdl; | 1326 | solo_enc->vfd->ctrl_handler = hdl; |
1327 | solo_enc->vfd->queue = &solo_enc->vidq; | 1327 | solo_enc->vfd->queue = &solo_enc->vidq; |
1328 | solo_enc->vfd->lock = &solo_enc->lock; | 1328 | solo_enc->vfd->lock = &solo_enc->lock; |
1329 | set_bit(V4L2_FL_USE_FH_PRIO, &solo_enc->vfd->flags); | ||
1330 | video_set_drvdata(solo_enc->vfd, solo_enc); | 1329 | video_set_drvdata(solo_enc->vfd, solo_enc); |
1331 | ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr); | 1330 | ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr); |
1332 | if (ret < 0) | 1331 | if (ret < 0) |
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2.c b/drivers/staging/media/solo6x10/solo6x10-v4l2.c index 5d0100eb38e6..ba2526c883e9 100644 --- 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) | |||
666 | goto fail; | 666 | goto fail; |
667 | } | 667 | } |
668 | solo_dev->vfd->ctrl_handler = &solo_dev->disp_hdl; | 668 | solo_dev->vfd->ctrl_handler = &solo_dev->disp_hdl; |
669 | set_bit(V4L2_FL_USE_FH_PRIO, &solo_dev->vfd->flags); | ||
670 | 669 | ||
671 | video_set_drvdata(solo_dev->vfd, solo_dev); | 670 | video_set_drvdata(solo_dev->vfd, solo_dev); |
672 | 671 | ||