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/pvrusb2 | |
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/pvrusb2')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index fe4159d478b3..5ffa0d2b0b0d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -183,7 +183,7 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
183 | case VIDIOC_S_INPUT: | 183 | case VIDIOC_S_INPUT: |
184 | case VIDIOC_S_TUNER: | 184 | case VIDIOC_S_TUNER: |
185 | case VIDIOC_S_FREQUENCY: | 185 | case VIDIOC_S_FREQUENCY: |
186 | ret = v4l2_prio_check(&vp->prio, &fh->prio); | 186 | ret = v4l2_prio_check(&vp->prio, fh->prio); |
187 | if (ret) | 187 | if (ret) |
188 | return ret; | 188 | return ret; |
189 | } | 189 | } |
@@ -972,7 +972,7 @@ static int pvr2_v4l2_release(struct file *file) | |||
972 | fhp->rhp = NULL; | 972 | fhp->rhp = NULL; |
973 | } | 973 | } |
974 | 974 | ||
975 | v4l2_prio_close(&vp->prio, &fhp->prio); | 975 | v4l2_prio_close(&vp->prio, fhp->prio); |
976 | file->private_data = NULL; | 976 | file->private_data = NULL; |
977 | 977 | ||
978 | if (fhp->vnext) { | 978 | if (fhp->vnext) { |
@@ -1093,7 +1093,7 @@ static int pvr2_v4l2_open(struct file *file) | |||
1093 | 1093 | ||
1094 | fhp->file = file; | 1094 | fhp->file = file; |
1095 | file->private_data = fhp; | 1095 | file->private_data = fhp; |
1096 | v4l2_prio_open(&vp->prio,&fhp->prio); | 1096 | v4l2_prio_open(&vp->prio, &fhp->prio); |
1097 | 1097 | ||
1098 | fhp->fw_mode_flag = pvr2_hdw_cpufw_get_enabled(hdw); | 1098 | fhp->fw_mode_flag = pvr2_hdw_cpufw_get_enabled(hdw); |
1099 | 1099 | ||