diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-01 07:03:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:58:54 -0400 |
commit | ffb4877ba013f94322083f77cbb05b35c2a218aa (patch) | |
tree | 0d041da73986e1dc7c845ff4418fb20f46bd7506 /drivers/media/video/ivtv | |
parent | 530d2d32068eaf3616e0ce9e58a5fde5701c3380 (diff) |
V4L/DVB: v4l2-common: simplify prio utility functions
v4l2_prio_init/open/close returned an int when in fact they would
always return 0. Make these void functions.
v4l2_prio_close and v4l2_prio_check pass an enum v4l2_priority as a
pointer for no good reason. Replace with a normal enum v4l2_priority
argument.
These changes will simplify the work of moving priority handling into
the v4l core.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-fileops.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index bee9605bd273..abf410943cc9 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/drivers/media/video/ivtv/ivtv-fileops.c | |||
@@ -853,7 +853,7 @@ int ivtv_v4l2_close(struct file *filp) | |||
853 | 853 | ||
854 | IVTV_DEBUG_FILE("close %s\n", s->name); | 854 | IVTV_DEBUG_FILE("close %s\n", s->name); |
855 | 855 | ||
856 | v4l2_prio_close(&itv->prio, &id->prio); | 856 | v4l2_prio_close(&itv->prio, id->prio); |
857 | v4l2_fh_del(fh); | 857 | v4l2_fh_del(fh); |
858 | v4l2_fh_exit(fh); | 858 | v4l2_fh_exit(fh); |
859 | 859 | ||
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index a17c659e6327..6573764f506d 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -1851,7 +1851,7 @@ static long ivtv_serialized_ioctl(struct ivtv *itv, struct file *filp, | |||
1851 | case VIDIOC_S_EXT_CTRLS: | 1851 | case VIDIOC_S_EXT_CTRLS: |
1852 | case VIDIOC_S_FBUF: | 1852 | case VIDIOC_S_FBUF: |
1853 | case VIDIOC_OVERLAY: | 1853 | case VIDIOC_OVERLAY: |
1854 | ret = v4l2_prio_check(&itv->prio, &id->prio); | 1854 | ret = v4l2_prio_check(&itv->prio, id->prio); |
1855 | if (ret) | 1855 | if (ret) |
1856 | return ret; | 1856 | return ret; |
1857 | } | 1857 | } |