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/cpia2 | |
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/cpia2')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 6f91415eb7b4..5520789854da 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -324,7 +324,7 @@ static int cpia2_close(struct file *file) | |||
324 | { | 324 | { |
325 | if(fh->mmapped) | 325 | if(fh->mmapped) |
326 | cam->mmapped = 0; | 326 | cam->mmapped = 0; |
327 | v4l2_prio_close(&cam->prio,&fh->prio); | 327 | v4l2_prio_close(&cam->prio, fh->prio); |
328 | file->private_data = NULL; | 328 | file->private_data = NULL; |
329 | kfree(fh); | 329 | kfree(fh); |
330 | } | 330 | } |
@@ -1592,7 +1592,7 @@ static long cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
1592 | case VIDIOC_S_FMT: | 1592 | case VIDIOC_S_FMT: |
1593 | { | 1593 | { |
1594 | struct cpia2_fh *fh = file->private_data; | 1594 | struct cpia2_fh *fh = file->private_data; |
1595 | retval = v4l2_prio_check(&cam->prio, &fh->prio); | 1595 | retval = v4l2_prio_check(&cam->prio, fh->prio); |
1596 | if(retval) { | 1596 | if(retval) { |
1597 | mutex_unlock(&cam->busy_lock); | 1597 | mutex_unlock(&cam->busy_lock); |
1598 | return retval; | 1598 | return retval; |