diff options
| author | Ramakrishnan Muthukrishnan <ramakrmu@cisco.com> | 2014-06-19 13:22:58 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-04 15:14:59 -0400 |
| commit | 95cd5d5ee67c2108765ae87d34761d54fd6671ce (patch) | |
| tree | c0f2f37178ab8a57f142522bf8d1a7b6a1ca36c1 /drivers/media/platform/davinci | |
| parent | b7284bb0be49441805ae7db0fc419ab7ee882bff (diff) | |
[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>
Diffstat (limited to 'drivers/media/platform/davinci')
| -rw-r--r-- | drivers/media/platform/davinci/vpbe_display.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/davinci/vpfe_capture.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/davinci/vpif_display.c | 1 |
4 files changed, 0 insertions, 4 deletions
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)); |
